Fix issue when JSON value is NULL in xreq

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

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 61ba4fd..fbed6ed 100644 (file)
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 
 #include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
 
 #include "afb-context.h"
 #include "afb-xreq.h"
@@ -54,7 +55,9 @@ static void vinfo(void *first, void *second, const char *fmt, va_list args, void
 static struct json_object *xreq_json_cb(void *closure)
 {
        struct afb_xreq *xreq = closure;
-       return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
+       if (!xreq->json && xreq->queryitf->json)
+               xreq->json = xreq->queryitf->json(xreq);
+       return xreq->json;
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
@@ -663,8 +666,11 @@ static void process_sync(struct afb_xreq *xreq)
                afb_hook_xreq_begin(xreq);
 
        /* search the api */
-       if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) {
-               afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+       if (afb_apiset_get_started(xreq->apiset, xreq->api, &api) < 0) {
+               if (errno == ENOENT)
+                       afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+               else
+                       afb_xreq_fail_f(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
        } else {
                xreq->context.api_key = api.closure;
                api.itf->call(api.closure, xreq);