database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-16054 simple json functions flatline cpu on garbage input.

Browse Source 
Incorrect char sentence should be handled properly.
This commit is contained in:
Alexey Botchkov
2018-07-31 16:33:05 +04:00
parent fd378fc613
commit f4eac2deeb
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/func_json.result
View File

@ -760,3 +760,9 @@ t1 CREATE TABLE `t1` (
`c2` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL `c2` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-16054 simple json functions flatline cpu on garbage input.
#
select json_array(1,uuid(),compress(5.140264e+307));
json_array(1,uuid(),compress(5.140264e+307))
NULL

7
mysql-test/t/func_json.test
View File

@ -422,3 +422,10 @@ CREATE TABLE t1 AS SELECT
JSON_QUOTE(_utf8'foo') AS c2; JSON_QUOTE(_utf8'foo') AS c2;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-16054 simple json functions flatline cpu on garbage input.
--echo #
select json_array(1,uuid(),compress(5.140264e+307));

2
strings/json_lib.c
View File

@ -1645,6 +1645,8 @@ int json_escape(CHARSET_INFO *str_cs,
return -1; return -1;
} }
} }
else /* c_len == 0, an illegal symbol. */
return -1;
} }
return (int)(json - json_start); return (int)(json - json_start);