Skip to content

Fix json_validate double free in parser when discarding lookahead #9696

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

Merged
merged 2 commits into from
Oct 9, 2022
Merged

Fix json_validate double free in parser when discarding lookahead #9696

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a285231
Fix json_validate double free in parser when discarding lookahead
iluuu1994 Oct 9, 2022
462e78d
Fix uninitialized value->value
iluuu1994 Oct 9, 2022
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
9 changes: 6 additions & 3 deletions ext/json/json_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,16 @@ static int php_json_parser_object_update_validate(php_json_parser *parser, zval
static int php_json_yylex(union YYSTYPE *value, php_json_parser *parser)
{
int token = php_json_scan(&parser->scanner);
value->value = parser->scanner.value;

if (parser->methods.array_create == php_json_parser_array_create_validate
bool validate = parser->methods.array_create == php_json_parser_array_create_validate
&& parser->methods.array_append == php_json_parser_array_append_validate
&& parser->methods.object_create == php_json_parser_object_create_validate
&& parser->methods.object_update == php_json_parser_object_update_validate) {
&& parser->methods.object_update == php_json_parser_object_update_validate;

if (validate) {
zval_ptr_dtor_str(&(parser->scanner.value));
} else {
value->value = parser->scanner.value;
}

return token;
Expand Down