kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "manager.c: Fixed "(null):" header in AMI AsyncAGIEnd event"

Browse Source
This commit is contained in:
Jenkins2
2018-02-05 12:23:19 -06:00
committed by Gerrit Code Review
parent b392c1013f 7e32adf044
commit 2d90b1efd9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/manager.c
View File

@@ -1770,7 +1770,12 @@ void manager_json_to_ast_str(struct ast_json *obj, const char *key,
{
struct ast_json_iter *i;
if (!obj || (!res && !(*res) && (!(*res = ast_str_create(1024))))) {
/* If obj or res is not given, just return */
if (!obj || !res) {
return;
}
if (!*res && !(*res = ast_str_create(1024))) {
return;
}
@@ -1801,11 +1806,14 @@ void manager_json_to_ast_str(struct ast_json *obj, const char *key,
}
}
struct ast_str *ast_manager_str_from_json_object(struct ast_json *blob, key_exclusion_cb exclusion_cb)
{
struct ast_str *res = ast_str_create(1024);
manager_json_to_ast_str(blob, NULL, &res, exclusion_cb);
if (!ast_json_is_null(blob)) {
manager_json_to_ast_str(blob, NULL, &res, exclusion_cb);
}
return res;
}