Improve parsing of json string

[src/app-framework-binder.git] / src / main-afb-daemon.c

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 3f32e87..df0efbc 100644 (file)
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -534,8 +534,7 @@ static void startup_call_unref(struct afb_xreq *xreq)
        free(sreq->api);
        free(sreq->verb);
        json_object_put(sreq->xreq.json);
-       sreq->index++;
-       if (sreq->index < sreq->count)
+       if (++sreq->index < sreq->count)
                startup_call_current(sreq);
        else {
                afb_session_close(sreq->session);
@@ -553,6 +552,7 @@ static struct afb_xreq_query_itf startup_xreq_itf =
 static void startup_call_current(struct startup_req *sreq)
 {
        const char *api, *verb, *json;
+       enum json_tokener_error jerr;
 
        sreq->callspec = json_object_get_string(json_object_array_get_idx(sreq->calls, sreq->index)),
        api = sreq->callspec;
@@ -567,8 +567,8 @@ static void startup_call_current(struct startup_req *sreq)
                        sreq->verb = strndup(verb + 1, json - verb - 1);
                        sreq->xreq.request.called_api = sreq->api;
                        sreq->xreq.request.called_verb = sreq->verb;
-                       sreq->xreq.json = json_tokener_parse(json + 1);
-                       if (sreq->api && sreq->verb && sreq->xreq.json) {
+                       sreq->xreq.json = json_tokener_parse_verbose(json + 1, &jerr);
+                       if (sreq->api && sreq->verb && jerr == json_tokener_success) {
                                afb_xreq_process(&sreq->xreq, main_apiset);
                                return;
                        }