Skip to content

Commit ff6c293

Browse files
InterLinked1jcolp
authored andcommitted
func_json: Fix JSON parsing issues.
Fix issue with returning empty instead of dumping the JSON string when recursing. Also adds a unit test to capture this fix. ASTERISK-30441 #close Change-Id: If0bde9f3fe84f7af485e0838205cc21e0f752a85
1 parent 95a41d2 commit ff6c293

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

funcs/func_json.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ static int parse_node(char **key, char *currentkey, char *nestchar, int count, s
174174
previouskey = currentkey;
175175
currentkey = strsep(key, nestchar); /* retrieve the desired index */
176176
ast_debug(1, "Recursing on object (key was '%s' and is now '%s')\n", previouskey, currentkey);
177-
if (parse_node(key, currentkey, nestchar, count, ast_json_object_get(jsonval, currentkey), buf, len, depth)) { /* recurse on this node */
177+
if (!currentkey) { /* this is the end, so just dump the object */
178+
char *result2 = ast_json_dump_string(jsonval);
179+
ast_copy_string(buf, result2, len);
180+
ast_json_free(result2);
181+
} else if (parse_node(key, currentkey, nestchar, count, ast_json_object_get(jsonval, currentkey), buf, len, depth)) { /* recurse on this node */
178182
return -1;
179183
}
180184
}
@@ -305,6 +309,7 @@ AST_TEST_DEFINE(test_JSON_DECODE)
305309
{"{ \"path\": { \"to\": { \"arr\": [ {\"name\": \"John Smith\", \"phone\": \"123\"}, {\"name\": \"Jane Doe\", \"phone\": \"234\"} ] } } }", ",c", "path.to.arr.0.name", "John Smith"},
306310
{"{ \"path\": { \"to\": { \"arr\": [ {\"name\": 1, \"phone\": 123}, {\"name\": 2, \"phone\": 234} ] } } }", ",c", "path.to.arr.0.name", "1"},
307311
{"{ \"path\": { \"to\": { \"arr\": [ {\"name\": [ \"item11\", \"item12\" ], \"phone\": [ \"item13\", \"item14\" ]}, {\"name\": [ \"item15\", \"item16\" ], \"phone\": [ \"item17\", \"item18\" ]} ] } } }", ",c", "path.to.arr.0.name.1", "item12"},
312+
{"{ \"startId\": \"foobar\", \"abcd\": { \"id\": \"abcd\", \"type\": \"EXT\" }, \"bcde\": { \"id\": \"bcde\", \"type\": \"CONDITION\" }, \"defg\": { \"id\": \"defg\", \"type\": \"EXT\" }, \"efgh\": { \"id\": \"efgh\", \"type\": \"VOICEMAIL\" } }", "", "bcde", "{\"id\":\"bcde\",\"type\":\"CONDITION\"}"},
308313
};
309314

310315
switch (cmd) {

0 commit comments

Comments
 (0)