Skip to content

MDEV-40572/MDEV-40165 postfix - JSON handling fixes #5479

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
grooverdan wants to merge 2 commits into
base: 10.11
Choose a base branch
from
+102 −3
Open

MDEV-40572/MDEV-40165 postfix - JSON handling fixes #5479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c05a6
MDEV-40572 SIGSEGV in JSON_OVERLAPS()
grooverdan Aug 1, 2026
6750218
MDEV-40165 JSON_EQUAL/JSON_NORMALIZE/JSON_CONTAINS error handling
grooverdan Aug 1, 2026
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
64 changes: 64 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 @@ -3022,4 +3022,68 @@ x
NULL
SELECT 1 FROM (SELECT JSON_REMOVE(46, DATE(NULL)) AS x EXCEPT SELECT 1) AS d WHERE NOT(NOT(x > 10)) AND (x < 1 OR x > 1);
1
#
# MDEV-40572 SIGSEGV in JSON_OVERLAPS() on a truncated nested JSON object with different character sets/collations
#
SET @col=@@collation_connection;
SET @char=@@character_set_connection;
SET collation_connection=ucs2_general_ci;
SELECT JSON_OVERLAPS ('{"B":{}}', '{"B":{') AS exp_ucs2;
exp_ucs2
0
Warnings:
Warning 4037 Unexpected end of JSON text in argument 2 to function 'json_overlaps'
SET character_set_connection=utf16;
SELECT JSON_OVERLAPS ('{"B":{}}', '{"B":{') AS exp_utf16;
exp_utf16
0
Warnings:
Warning 4037 Unexpected end of JSON text in argument 2 to function 'json_overlaps'
SET @@collation_connection=@col;
SET @@character_set_connection=@char;
#
# MDEV-40165 JSON_EQUAL/JSON_NORMALIZE/JSON_CONTAINS error handling
#
CREATE TABLE t(c1 JSON, c2 JSON);
INSERT INTO t VALUES ('{"a":1,"b":2}', '{"b":2E0, "a":1E0}'),
(NULL, '["a", "b"]'),
('{"r": 1}', NULL),
('[{"a": 3}, {"d": [1, 2, 3]}]', '[{"d": [1E0, 2E0, 3E0]}, {"a":3E0}]');
SELECT c1, JSON_EQUALS(c1, '{"r": 1E0}') AS je_c1_const FROM t;
c1 je_c1_const
{"a":1,"b":2} 0
NULL NULL
{"r": 1} 1
[{"a": 3}, {"d": [1, 2, 3]}] 0
SELECT c1, c2, JSON_EQUALS(c1, c2) AS je_c1_c2 FROM t;
c1 c2 je_c1_c2
{"a":1,"b":2} {"b":2E0, "a":1E0} 1
NULL ["a", "b"] NULL
{"r": 1} NULL NULL
[{"a": 3}, {"d": [1, 2, 3]}] [{"d": [1E0, 2E0, 3E0]}, {"a":3E0}] 0
SELECT c1, JSON_CONTAINS(c1, '{"r": 1E0}') AS jc_c1_const FROM t;
c1 jc_c1_const
{"a":1,"b":2} 0
NULL NULL
{"r": 1} 1
[{"a": 3}, {"d": [1, 2, 3]}] 0
SELECT c1, c2, JSON_CONTAINS(c1, c2) AS jc_c1_c2 FROM t;
c1 c2 jc_c1_c2
{"a":1,"b":2} {"b":2E0, "a":1E0} 1
NULL ["a", "b"] NULL
{"r": 1} NULL NULL
[{"a": 3}, {"d": [1, 2, 3]}] [{"d": [1E0, 2E0, 3E0]}, {"a":3E0}] 1
SELECT c1, JSON_OVERLAPS(c1, '{"r": 1E0}') AS jo_c1_const FROM t;
c1 jo_c1_const
{"a":1,"b":2} 0
NULL NULL
{"r": 1} 1
[{"a": 3}, {"d": [1, 2, 3]}] 0
SELECT c1, c2, JSON_OVERLAPS(c1, c2) AS jo_c1_c2 FROM t;
c1 c2 jo_c1_c2
{"a":1,"b":2} {"b":2E0, "a":1E0} 1
NULL ["a", "b"] NULL
{"r": 1} NULL NULL
[{"a": 3}, {"d": [1, 2, 3]}] [{"d": [1E0, 2E0, 3E0]}, {"a":3E0}] 1
DROP TABLE t;
# End of 10.11 Test
35 changes: 35 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 @@ -2150,4 +2150,39 @@ SELECT x FROM (SELECT 1 AS x UNION SELECT 2) AS t WHERE x IN ( SELECT JSON_REPL
SELECT ( WITH RECURSIVE x ( x ) AS (WITH RECURSIVE x ( x ) AS ( SELECT 1 UNION SELECT x + 1 FROM x ) SELECT json_array_append ( '[[], [], []]' , NOT ( NULL LIKE 'ABC%' ) , 315 )) SELECT x FROM x WHERE x > 10 AND x < 1) AS x;
SELECT 1 FROM (SELECT JSON_REMOVE(46, DATE(NULL)) AS x EXCEPT SELECT 1) AS d WHERE NOT(NOT(x > 10)) AND (x < 1 OR x > 1);

--echo #
--echo # MDEV-40572 SIGSEGV in JSON_OVERLAPS() on a truncated nested JSON object with different character sets/collations
--echo #

SET @col=@@collation_connection;
SET @char=@@character_set_connection;

SET collation_connection=ucs2_general_ci;
SELECT JSON_OVERLAPS ('{"B":{}}', '{"B":{') AS exp_ucs2;
SET character_set_connection=utf16;
SELECT JSON_OVERLAPS ('{"B":{}}', '{"B":{') AS exp_utf16;

SET @@collation_connection=@col;
SET @@character_set_connection=@char;

--echo #
--echo # MDEV-40165 JSON_EQUAL/JSON_NORMALIZE/JSON_CONTAINS error handling
--echo #

CREATE TABLE t(c1 JSON, c2 JSON);
INSERT INTO t VALUES ('{"a":1,"b":2}', '{"b":2E0, "a":1E0}'),
(NULL, '["a", "b"]'),
('{"r": 1}', NULL),
('[{"a": 3}, {"d": [1, 2, 3]}]', '[{"d": [1E0, 2E0, 3E0]}, {"a":3E0}]');

SELECT c1, JSON_EQUALS(c1, '{"r": 1E0}') AS je_c1_const FROM t;
SELECT c1, c2, JSON_EQUALS(c1, c2) AS je_c1_c2 FROM t;

SELECT c1, JSON_CONTAINS(c1, '{"r": 1E0}') AS jc_c1_const FROM t;
SELECT c1, c2, JSON_CONTAINS(c1, c2) AS jc_c1_c2 FROM t;

SELECT c1, JSON_OVERLAPS(c1, '{"r": 1E0}') AS jo_c1_const FROM t;
SELECT c1, c2, JSON_OVERLAPS(c1, c2) AS jo_c1_c2 FROM t;
DROP TABLE t;

--echo # End of 10.11 Test
6 changes: 3 additions & 3 deletions sql/item_jsonfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4877,24 +4877,24 @@ int compare_nested_object(json_engine_t *js, json_engine_t *value)
if (json_normalize_engine(&je, &a_res, a.ptr(), a.length(), value->s.cs))
{
value->s.error= je.s.error;
value->s.c_str= je.s.c_str;
goto error;
}
if (json_normalize_engine(&je, &b_res, b.ptr(), b.length(), value->s.cs))
{
js->s.error= je.s.error;
js->s.c_str= je.s.c_str;
goto error;
}

result= strcmp(a_res.str, b_res.str) ? 0 : 1;

error:
error:
dynstr_free(&a_res);
dynstr_free(&b_res);

return MY_TEST(result);
}


int json_find_overlap_with_object(json_engine_t *js, json_engine_t *value,
bool compare_whole)
{
Expand Down