json: Fix json API wrapper code for json library versions earlier than 2.3.0.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 21 Feb 2014 17:47:58 +0000 (17:47 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 21 Feb 2014 17:47:58 +0000 (17:47 +0000)
* Fixed json ref counting issue with json API wrapper code for
ast_json_object_update_existing() and ast_json_object_update_missing()
when the json library is earlier than version 2.3.0.
........

Merged revisions 408711 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408712 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/json.c

index 066a5df..259b41e 100644 (file)
@@ -466,8 +466,13 @@ int ast_json_object_update_existing(struct ast_json *object, struct ast_json *ot
 
        while (iter != NULL && ret == 0) {
                const char *key = ast_json_object_iter_key(iter);
+
                if (ast_json_object_get(object, key) != NULL) {
-                       ret = ast_json_object_set(object, key, ast_json_object_iter_value(iter));
+                       struct ast_json *value = ast_json_object_iter_value(iter);
+
+                       if (!value || ast_json_object_set(object, key, ast_json_ref(value))) {
+                               ret = -1;
+                       }
                }
                iter = ast_json_object_iter_next(other, iter);
        }
@@ -488,8 +493,13 @@ int ast_json_object_update_missing(struct ast_json *object, struct ast_json *oth
 
        while (iter != NULL && ret == 0) {
                const char *key = ast_json_object_iter_key(iter);
+
                if (ast_json_object_get(object, key) == NULL) {
-                       ret = ast_json_object_set(object, key, ast_json_object_iter_value(iter));
+                       struct ast_json *value = ast_json_object_iter_value(iter);
+
+                       if (!value || ast_json_object_set(object, key, ast_json_ref(value))) {
+                               ret = -1;
+                       }
                }
                iter = ast_json_object_iter_next(other, iter);
        }