]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Make the reload stasis message bump the ref count of its sub-object
authorMatthew Jordan <mjordan@digium.com>
Mon, 10 Jun 2013 22:38:04 +0000 (22:38 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 10 Jun 2013 22:38:04 +0000 (22:38 +0000)
JSON objects are reference stealing. Hence, if you've RAII_VAR'd some
subobject and want to pack it into another JSON object, you have to bump
the reference count. Using the 'O' option during the pack will bump the
reference count for you.

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

main/loader.c

index 7e5a5ae3ba072bb727624ec5cc78f56d5890dc8e..be08d7f962ca89415f50a6ba1102ccca934d9747 100644 (file)
@@ -750,7 +750,7 @@ static void publish_reload_message(const char *name, enum ast_module_reload_resu
        event_object = ast_json_pack("{s: s, s: s}",
                        "Module", S_OR(name, "All"),
                        "Status", res_buffer);
-       json_object = ast_json_pack("{s: s, s: i, s: o}",
+       json_object = ast_json_pack("{s: s, s: i, s: O}",
                        "type", "Reload",
                        "class_type", EVENT_FLAG_SYSTEM,
                        "event", event_object);