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-22236 JSON_ARRAYAGG query leads to SIGSEGV in Charset::swap on optimized builds.

Browse Source 
The json_arrayagg::val_str should handle NULL result.
This commit is contained in:
Alexey Botchkov
2020-04-28 16:08:18 +04:00
parent 0cd2b4c249
commit e545a60bf4
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/func_json.result
View File

@ -1213,3 +1213,11 @@ DROP TABLE t1;
# #
# End of 10.4 tests # End of 10.4 tests
# #
#
# MDEV-16620 JSON_ARRAYAGG
#
CREATE TABLE t1 (a INT);
SELECT JSON_ARRAYAGG(a) FROM t1;
JSON_ARRAYAGG(a)
NULL
DROP TABLE t1;

8
mysql-test/main/func_json.test
View File

@ -732,3 +732,11 @@ DROP TABLE t1;
--echo # --echo #
--echo # End of 10.4 tests --echo # End of 10.4 tests
--echo # --echo #
-- echo #
-- echo # MDEV-16620 JSON_ARRAYAGG
-- echo #
CREATE TABLE t1 (a INT);
SELECT JSON_ARRAYAGG(a) FROM t1;
DROP TABLE t1;

15
sql/item_jsonfunc.cc
View File

@ -3632,13 +3632,14 @@ String* Item_func_json_arrayagg::convert_to_json(Item *item, String *res)
String* Item_func_json_arrayagg::val_str(String *str) String* Item_func_json_arrayagg::val_str(String *str)
{ {
str= Item_func_group_concat::val_str(str); if ((str= Item_func_group_concat::val_str(str)))
String s; {
s.append('['); String s;
s.swap(*str); s.append('[');
str->append(s); s.swap(*str);
str->append(']'); str->append(s);
str->append(']');
}
return str; return str;
} }