X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-wsj1.c;h=c8572a5075d9dd996c38ef5e6c283bb6ebebdef1;hb=e39610f8c9b2e6bbb8a460f7d7ccccbc5161b4ed;hp=f2b4a0843cc1bb627d281bbe5f7ed9d4bcf7a273;hpb=10aa15afc5bc7321d0049823dd173dda11ff3724;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-wsj1.c b/src/afb-wsj1.c
index f2b4a084..c8572a50 100644
--- a/src/afb-wsj1.c
+++ b/src/afb-wsj1.c
@@ -390,15 +390,15 @@ const char *afb_wsj1_msg_object_s(struct afb_wsj1_msg *msg)
 
 struct json_object *afb_wsj1_msg_object_j(struct afb_wsj1_msg *msg)
 {
+	enum json_tokener_error jerr;
 	struct json_object *object = msg->object_j;
 	if (object == NULL) {
 		pthread_mutex_lock(&msg->wsj1->mutex);
 		json_tokener_reset(msg->wsj1->tokener);
-		object = json_tokener_parse_ex(msg->wsj1->tokener, msg->object_s, (int)msg->object_s_length);
-		if (object == NULL && json_tokener_get_error(msg->wsj1->tokener) == json_tokener_continue)
-			object = json_tokener_parse_ex(msg->wsj1->tokener, "", 1);
+		object = json_tokener_parse_ex(msg->wsj1->tokener, msg->object_s, 1 + (int)msg->object_s_length);
+		jerr = json_tokener_get_error(msg->wsj1->tokener);
 		pthread_mutex_unlock(&msg->wsj1->mutex);
-		if (object == NULL) {
+		if (jerr != json_tokener_success) {
 			/* lazy error detection of json request. Is it to improve? */
 			object = json_object_new_string_len(msg->object_s, (int)msg->object_s_length);
 		}