From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Thu, 18 Dec 2008 03:21:26 +0000 (+0000)
Subject: protect against "null" locale
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f2da4933b75cb0f1c1c962b7ee50f3243081f09f;p=OpenSRF.git

protect against "null" locale

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1532 9efc2488-bf62-4759-914b-345cdb29e865
---

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;