summaryrefslogtreecommitdiff
path: root/ext/json/json_parser.y
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-09-20 15:08:14 +0200
committerAnatol Belski <ab@php.net>2017-09-20 15:08:45 +0200
commit3b2e8f8f7037be13dd31bc6becae3b039db8c5a9 (patch)
tree840e6be8e3dccb0b344f2e1580842bc61828ed98 /ext/json/json_parser.y
parent44e0b79ac64b344fc1335c126e548f00d8308602 (diff)
downloadphp-git-3b2e8f8f7037be13dd31bc6becae3b039db8c5a9.tar.gz
Sync json parser defs
Diffstat (limited to 'ext/json/json_parser.y')
-rw-r--r--ext/json/json_parser.y6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y
index e24d42c831..9b9df983ad 100644
--- a/ext/json/json_parser.y
+++ b/ext/json/json_parser.y
@@ -248,7 +248,8 @@ errlex:
static int php_json_parser_array_create(php_json_parser *parser, zval *array)
{
- return array_init(array);
+ array_init(array);
+ return SUCCESS;
}
static int php_json_parser_array_append(php_json_parser *parser, zval *array, zval *zvalue)
@@ -260,7 +261,8 @@ static int php_json_parser_array_append(php_json_parser *parser, zval *array, zv
static int php_json_parser_object_create(php_json_parser *parser, zval *object)
{
if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) {
- return array_init(object);
+ array_init(object);
+ return SUCCESS;
} else {
return object_init(object);
}