From f0d1cca6729f2593900af10d6aa324b7eedfe0c3 Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 29 May 2016 20:15:16 +0100 Subject: Use empty keys instead of _empty_ in json decoding --- ext/json/json_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/json/json_encoder.c') diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 62df102847..f944b888c7 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -169,7 +169,7 @@ static void php_json_encode_array(smart_str *buf, zval *val, int options) /* {{{ php_json_encode(buf, data, options); } else if (r == PHP_JSON_OUTPUT_OBJECT) { if (key) { - if (ZSTR_VAL(key)[0] == '\0' && Z_TYPE_P(val) == IS_OBJECT) { + if (ZSTR_VAL(key)[0] == '\0' && ZSTR_LEN(key) > 0 && Z_TYPE_P(val) == IS_OBJECT) { /* Skip protected and private members. */ if (tmp_ht && ZEND_HASH_APPLY_PROTECTION(tmp_ht)) { ZEND_HASH_DEC_APPLY_COUNT(tmp_ht); -- cgit v1.2.1