From dd9690f68c711e76d191a785394f74f5722079ee Mon Sep 17 00:00:00 2001 From: Sungtae Kim Date: Thu, 25 Jan 2018 02:58:22 +0100 Subject: [PATCH] manager.c: Fixed "(null):" header in AMI AsyncAGIEnd event * Changed to create ami_event string only when the given blob is not json_null(). * Fixed bad expression. ASTERISK-27621 Change-Id: Ice58c16361f9d9e8648261c9ed5d6c8245fb0d8f --- main/manager.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/main/manager.c b/main/manager.c index 4e611a085b..cfe1cbfdd0 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1766,7 +1766,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; } @@ -1797,11 +1802,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; }