Skip to content

ext/json: Stop encoding after a key fails to encode #24123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iliaal wants to merge 1 commit into from
Closed

ext/json: Stop encoding after a key fails to encode #24123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ PHP NEWS
(adapik)
. Fixed json_encode() silently narrowing $depth values outside the int range,
which wrapped to an unrelated depth. (cuishuang)
. Fixed json_encode() continuing to encode after an array or object key
failed to encode. (Ilia Alshanetsky)

- LDAP:
. Fix crash in ldap_exop_sync() when $response_data is omitted. (lacatoire)
Expand Down
8 changes: 4 additions & 4 deletions ext/json/json_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ static zend_result php_json_encode_array(smart_str *buf, zval *val, int options,

if (php_json_escape_string(buf, ZSTR_VAL(prop_info->name), ZSTR_LEN(prop_info->name),
options & ~PHP_JSON_NUMERIC_CHECK, encoder) == FAILURE) {
if (ZEND_HAS_OOM()) {
if (ZEND_HAS_OOM() || !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
PHP_JSON_HASH_UNPROTECT_RECURSION(obj);
return FAILURE;
}
if ((options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) && buf->s) {
if (buf->s) {
ZEND_ASSERT(ZSTR_LEN(buf->s) >= 4);
ZSTR_LEN(buf->s) -= 4;
smart_str_appendl(buf, "\"\"", 2);
Expand Down Expand Up @@ -308,13 +308,13 @@ static zend_result php_json_encode_array(smart_str *buf, zval *val, int options,

if (php_json_escape_string(buf, ZSTR_VAL(key), ZSTR_LEN(key),
options & ~PHP_JSON_NUMERIC_CHECK, encoder) == FAILURE) {
if (ZEND_HAS_OOM()) {
if (ZEND_HAS_OOM() || !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) {
PHP_JSON_HASH_UNPROTECT_RECURSION(recursion_rc);
zend_release_properties(prop_ht);
zval_ptr_dtor(&tmp);
return FAILURE;
}
if ((options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) && buf->s) {
if (buf->s) {
ZEND_ASSERT(ZSTR_LEN(buf->s) >= 4);
ZSTR_LEN(buf->s) -= 4;
smart_str_appendl(buf, "\"\"", 2);
Expand Down
55 changes: 55 additions & 0 deletions ext/json/tests/json_encode_invalid_key_aborts.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
--TEST--
json_encode() stops encoding after an object or array key fails to encode
--FILE--
<?php

class Value implements JsonSerializable
{
public function jsonSerialize(): mixed
{
echo "jsonSerialize() called\n";
return 1;
}
}

eval('class Declared { public $' . "\xff" . ' = 1; public $next; }');

$dynamic = new stdClass;
$dynamic->{"\xff"} = 1;
$dynamic->next = new Value;

$declared = new Declared;
$declared->next = new Value;

$cases = [
'array' => ["\xff" => 1, 'next' => new Value],
'array, later NAN' => ["\xff" => 1, 'next' => NAN],
'dynamic property' => $dynamic,
'declared property' => $declared,
];

foreach ($cases as $name => $value) {
echo "$name:\n";
var_dump(json_encode($value), json_last_error_msg());
}

echo "partial output:\n";
var_dump(json_encode(["\xff" => 1, 'next' => 2], JSON_PARTIAL_OUTPUT_ON_ERROR), json_last_error_msg());

?>
--EXPECT--
array:
bool(false)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
array, later NAN:
bool(false)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
dynamic property:
bool(false)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
declared property:
bool(false)
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
partial output:
string(15) "{"":1,"next":2}"
string(56) "Malformed UTF-8 characters, possibly incorrectly encoded"
Loading