Skip to content
/ server Public

MDEV-35548: Fix out-of-bounds array access in json_get_path_start #4739

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

Open
varundeepsaini wants to merge 1 commit into
base: 10.6
Choose a base branch
from
Open

MDEV-35548: Fix out-of-bounds array access in json_get_path_start #4739

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
8 changes: 8 additions & 0 deletions mysql-test/main/func_json.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,14 @@ null<=>json_extract('1',json_object(null,'{ }',null,null),'{}')
1
Warnings:
Warning 4042 Syntax error in JSON path in argument 2 to function 'json_extract' at position 1
SELECT JSON_EXTRACT('{a:true}','$.a')=TRUE;
JSON_EXTRACT('{a:true}','$.a')=TRUE
NULL
Warnings:
Warning 4038 Syntax error in JSON text in argument 1 to function 'json_extract' at position 2
SELECT JSON_EXTRACT('0E+0','$');
JSON_EXTRACT('0E+0','$')
0E+0
#
# End of 10.6 tests
#
4 changes: 4 additions & 0 deletions mysql-test/main/func_json.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,10 @@ FROM JSON_TABLE (@data, '$[*]' COLUMNS (data text PATH '$.Data')) AS t;
select null<=>json_extract('1',json_object(null,'{ }',null,null),'{}');



SELECT JSON_EXTRACT('{a:true}','$.a')=TRUE;
SELECT JSON_EXTRACT('0E+0','$');

--echo #
--echo # End of 10.6 tests
--echo #
4 changes: 2 additions & 2 deletions strings/json_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,14 +1701,14 @@ int json_get_path_start(json_engine_t *je, CHARSET_INFO *i_cs,
json_path_t *p)
{
json_scan_start(je, i_cs, str, end);
p->last_step= p->steps - 1;
p->last_step= NULL;
return 0;
}


int json_get_path_next(json_engine_t *je, json_path_t *p)
{
if (p->last_step < p->steps)
if (p->last_step == NULL)
{
if (json_read_value(je))
return 1;
Expand Down