homescreen/hs-proxy: Guard against empty appids

[apps/agl-service-homescreen.git] / src / hs-proxy.cpp

diff --git a/src/hs-proxy.cpp b/src/hs-proxy.cpp
index f8b796c..ea8976c 100644 (file)
--- a/src/hs-proxy.cpp
+++ b/src/hs-proxy.cpp
@@ -43,6 +43,7 @@ const char _afm_main[] = "afm-main";
 static void api_callback(void *closure, struct json_object *object, const char *error, const char *info, afb_api_t api)
 {
     AFB_INFO("asynchronous call, error=%s, info=%s, object=%s.", error, info, json_object_get_string(object));
+    (void) api;
     struct closure_data *cdata = static_cast<struct closure_data *>(closure);
 
     if (!cdata->hs_instance) {
@@ -56,7 +57,7 @@ static void api_callback(void *closure, struct json_object *object, const char *
 
     /* if we have an error then we couldn't start the application so we remove it */
     if (error) {
-          AFB_INFO("asynchronous call, removing client %s", cdata->appid);
+          AFB_INFO("asynchronous call, removing client %s", cdata->appid.c_str());
            clientManager->removeClient(cdata->appid);
     }
 
@@ -184,7 +185,7 @@ void HS_AfmMainProxy::start(struct hs_instance *instance, afb_req_t request, con
      * and client context there. We pass the closure_data with the client context
      * and the application id to remove it.
      */
-    if (!instance)
+    if (!instance || id.empty())
            return;
 
     cdata = static_cast<struct closure_data *>(calloc(1, sizeof(*cdata)));