kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audit ast_json_pack() calls for needed UTF-8 checks.

Browse Source 
Added needed UTF-8 checks before constructing json objects in various
files for strings obtained outside the system.  In this case string values
from a channel driver's peer and not from the user setting channel
variables.

* aoc.c: Fixed type mismatch in s_to_json() for time and granularity json
object construction.

ASTERISK-26466
Reported by: Richard Mudgett

Change-Id: Iac2d867fa598daba5c5dbc619b5464625a7f2096
This commit is contained in:
Richard Mudgett
2016-10-12 16:24:14 -05:00
parent 774d5f7ef7
commit 9c49b96374
6 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_fax.c
View File

@@ -1415,11 +1415,13 @@ static int report_fax_status(struct ast_channel *chan, struct ast_fax_session_de
}
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,
"local_station_id", details->localstationid,
"filenames", json_filenames);
"type", "status",
"operation", (details->caps & AST_FAX_TECH_GATEWAY)
? "gateway"
: (details->caps & AST_FAX_TECH_RECEIVE) ? "receive" : "send",
"status", status,
"local_station_id", AST_JSON_UTF8_VALIDATE(details->localstationid),
"filenames", json_filenames);
if (!json_object) {
return -1;
}