diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-05-29 20:15:16 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-20 19:44:00 +0100 |
| commit | f0d1cca6729f2593900af10d6aa324b7eedfe0c3 (patch) | |
| tree | c382aaa0701ff74b2c91f558f0bffe43af856627 /ext/json/json_parser.y | |
| parent | 297502609068724ae4222c6e9baefe2b26165063 (diff) | |
| download | php-git-f0d1cca6729f2593900af10d6aa324b7eedfe0c3.tar.gz | |
Use empty keys instead of _empty_ in json decoding
Diffstat (limited to 'ext/json/json_parser.y')
| -rw-r--r-- | ext/json/json_parser.y | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index fafe75cbf3..43d941b56c 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -273,10 +273,7 @@ static int php_json_parser_object_update(php_json_parser *parser, zval *object, zend_symtable_update(Z_ARRVAL_P(object), key, zvalue); } else { zval zkey; - if (ZSTR_LEN(key) == 0) { - zend_string_release(key); - key = zend_string_init("_empty_", sizeof("_empty_") - 1, 0); - } else if (ZSTR_VAL(key)[0] == '\0') { + if (ZSTR_LEN(key) > 0 && ZSTR_VAL(key)[0] == '\0') { parser->scanner.errcode = PHP_JSON_ERROR_INVALID_PROPERTY_NAME; zend_string_release(key); zval_dtor(zvalue); |