kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 01:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pack the right number of items into the status and receive fax blobs

Browse Source 
The code was still attempting to pack an additional item into the blobs
that didn't exist. Crashes ensued. This patch modifies the publishing of
these messages so that the correct number of items are packed in the JSON.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-05-29 03:22:04 +00:00
parent 6851801a5e
commit 071c1e290d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_fax.c
View File

@@ -1184,7 +1184,7 @@ static int report_fax_status(struct ast_channel *chan, struct ast_fax_session_de
return -1;
}
json_object = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: o}",
json_object = ast_json_pack("{s: s, s: s, s: s, s: s, s: o}",
"type", "status",
"operation", (details->caps & AST_FAX_TECH_GATEWAY) ? "gateway" : (details->caps & AST_FAX_TECH_RECEIVE) ? "receive" : "send",
"status", status,
@@ -1777,7 +1777,7 @@ static int report_receive_fax_status(struct ast_channel *chan, const char *filen
{
SCOPED_CHANNELLOCK(lock, chan);
json_object = ast_json_pack("s: s, s: s, s: s, s: s, s: s, s: s, s: s, s: o",
json_object = ast_json_pack("s: s, s: s, s: s, s: s, s: s, s: s, s: o",
"type", "receive"
"remote_station_id", S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
"local_station_id", S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),