]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Properly pack the parameters into ast_json_pack when sending a send fax message
authorMatthew Jordan <mjordan@digium.com>
Sun, 23 Jun 2013 19:19:30 +0000 (19:19 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sun, 23 Jun 2013 19:19:30 +0000 (19:19 +0000)
This patch properly packs the parameters into the send fax message so that it
actually work.

Missing a ',' between two string fields can be difficult to debug, particularly
when the actual packing succeeds. Interestingly enough, this didn't actually
crash until the JSON blob we deref'd and disposed of. Since that happened in
a different thread, it was pretty tough to track down.

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

res/res_fax.c

index 40a43189c69cbb3ac501b09f7245b2313e10192b..6341a55ff182bc8e52eb1c106669d0748d7d121f 100644 (file)
@@ -2308,9 +2308,8 @@ static int report_send_fax_status(struct ast_channel *chan, struct ast_fax_sessi
                if (!ast_strlen_zero(fax_bitrate)) {
                        fax_bitrate = ast_strdupa(fax_bitrate);
                }
-
                json_obj = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: o}",
-                               "type", "send"
+                               "type", "send",
                                "remote_station_id", S_OR(remote_station_id, ""),
                                "local_station_id", S_OR(local_station_id, ""),
                                "fax_pages", S_OR(fax_pages, ""),