From a6aff946abf587bfb79e7b9e51141795fd91a843 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Thu, 5 Dec 2019 22:58:42 -0800
Subject: [PATCH] binding: navigation: deep copy json response for cache
To avoid possible side effects from afb framework releasing
a cached json_object just deep copy to target cached object.
Bug-AGL: SPEC-2880
Change-Id: Ie953d4668cd4e9a33a91d727a378cd24e75f112e
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
binding/navigation-api.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/binding/navigation-api.c b/binding/navigation-api.c
index ab7a5b7..e2aa6b1 100644
--- a/binding/navigation-api.c
+++ b/binding/navigation-api.c
@@ -132,7 +132,11 @@ static void broadcast(afb_req_t request, const char *name, gboolean cache)
{
struct navigation_state *ns = navigation_get_userdata(request);
afb_event_t event = get_event_from_value(ns, name);
- json_object *jresp = afb_req_json(request);
+ json_object *jresp = afb_req_json(request), *tmp = NULL;
+
+
+ if (json_object_deep_copy(jresp, (json_object **) &tmp, NULL))
+ return;
if (cache) {
json_object **storage;
@@ -143,27 +147,22 @@ static void broadcast(afb_req_t request, const char *name, gboolean cache)
if (*storage)
json_object_put(*storage);
+ *storage = NULL;
// increment reference for storage
- json_object_get(jresp);
- *storage = jresp;
+ json_object_get(tmp);
+ *storage = tmp;
// increment reference for event
- json_object_get(jresp);
- afb_event_push(event, jresp);
+ json_object_get(tmp);
+ afb_event_push(event, tmp);
g_rw_lock_writer_unlock(&ns->rw_lock);
return;
}
- g_rw_lock_reader_lock(&ns->rw_lock);
-
- // increment reference for event
- json_object_get(jresp);
- afb_event_push(event, jresp);
-
- g_rw_lock_reader_unlock(&ns->rw_lock);
+ afb_event_push(event, tmp);
}
static void broadcast_status(afb_req_t request)
--
GitLab