diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-06-23 19:19:30 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-06-23 19:19:30 +0000 |
| commit | cc29957a6f3339667f02a7386416c7374122d403 (patch) | |
| tree | 01567d5fca502fe189a27c084edbe994fbe7a7a3 /res/res_fax.c | |
| parent | 477e207f284ea3dda8db07fef84d7f01665004c4 (diff) | |
Properly pack the parameters into ast_json_pack when sending a send fax message
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
Diffstat (limited to 'res/res_fax.c')
| -rw-r--r-- | res/res_fax.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 40a43189c..6341a55ff 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -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, ""), |