From a9b72a6199d39e7a595a51102d228db418ac9a62 Mon Sep 17 00:00:00 2001
From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Thu, 18 Dec 2008 03:21:02 +0000
Subject: [PATCH] protect against "null" locale

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1531 9efc2488-bf62-4759-914b-345cdb29e865
---
 src/libopensrf/osrf_message.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libopensrf/osrf_message.c b/src/libopensrf/osrf_message.c
index a774c84..c9e85c4 100644
--- a/src/libopensrf/osrf_message.c
+++ b/src/libopensrf/osrf_message.c
@@ -310,8 +310,8 @@ int osrf_message_deserialize(const char* string, osrfMessage* msgs[], int count)
 				free( current_locale );
 
 			tmp = jsonObjectGetKeyConst(message, "locale");
-			if(tmp) {
-				new_msg->sender_locale = jsonObjectToSimpleString(tmp);
+
+			if(tmp && (new_msg->sender_locale = jsonObjectToSimpleString(tmp))) {
 				current_locale = strdup( new_msg->sender_locale );
 			} else {
 				current_locale = NULL;
-- 
2.43.2