summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-06-10 22:38:04 +0000
committerMatthew Jordan <mjordan@digium.com>2013-06-10 22:38:04 +0000
commited85661f43ae5ea5cbca3055f64964964e79e845 (patch)
treecf189ffe1fd539ea3f3f65c08bed25ff745e125f
parent75e7c3a8fa97957ee582f4553aafc4fa6977c25c (diff)
Make the reload stasis message bump the ref count of its sub-object
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
-rw-r--r--main/loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c
index 7e5a5ae3b..be08d7f96 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -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);