diff options
| author |   Jose Bollo <jose.bollo@iot.bzh> | 2018-08-01 13:44:23 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2018-08-02 15:49:43 +0200 |
| commit | e39610f8c9b2e6bbb8a460f7d7ccccbc5161b4ed (patch) | |
| tree | 9f11498d5ba8793c925a4b1a36591dfdc736adbb /src/afb-wsj1.c | |
| parent | 10aa15afc5bc7321d0049823dd173dda11ff3724 (diff) | |
Improve parsing of json string
Change-Id: I7100961ef8f8a75d623a0667178f191dd4cfb9d3
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-wsj1.c')
| -rw-r--r-- | src/afb-wsj1.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |