database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-26724 Endless loop in json_escape_to_string upon ... empty string

Browse Source 
Correctly handle empty string when [un]escaping JSON
This commit is contained in:
Sergei Petrunia
2021-10-01 14:15:17 +03:00
parent 61cd4f4412
commit 5c709ef18c
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_histogram_json.cc
View File

@@ -41,7 +41,7 @@ static bool json_unescape_to_string(const char *val, int val_len, String* out)
(const uchar*)val + val_len,
&my_charset_utf8mb4_bin,
buf, buf + out->length());
if (res > 0)
if (res >= 0)
{
out->length(res);
return false; // Ok
@@ -74,7 +74,7 @@ static bool json_escape_to_string(const char *val, int val_len, String* out)
(const uchar*)val + val_len,
&my_charset_utf8mb4_bin,
buf, buf + out->length());
if (res > 0)
if (res >= 0)
{
out->length(res);
return false; // Ok