From 7c556c44a10bfc53c37295626e61bd99dc4f550c Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 15 Oct 2017 19:36:15 +0100 Subject: Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key) --- ext/json/json_encoder.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ext/json/json_encoder.c') diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 1fa2344204..fcdb315954 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -189,8 +189,13 @@ static int php_json_encode_array(smart_str *buf, zval *val, int options, php_jso php_json_pretty_print_char(buf, options, '\n'); php_json_pretty_print_indent(buf, options, encoder); - php_json_escape_string(buf, ZSTR_VAL(key), ZSTR_LEN(key), - options & ~PHP_JSON_NUMERIC_CHECK, encoder); + if (php_json_escape_string(buf, ZSTR_VAL(key), ZSTR_LEN(key), + options & ~PHP_JSON_NUMERIC_CHECK, encoder) == FAILURE && + (options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) && + buf->s) { + ZSTR_LEN(buf->s) -= 4; + smart_str_appendl(buf, "\"\"", 2); + } } else { if (need_comma) { smart_str_appendc(buf, ','); -- cgit v1.2.1