mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
json_unescape: don't fill unconverted characters with ?
Return an error, and handle let the caller handler the SQL error.
This commit is contained in:
@@ -1656,15 +1656,7 @@ int json_unescape(CHARSET_INFO *json_cs,
|
|||||||
}
|
}
|
||||||
if (c_len == MY_CS_ILUNI)
|
if (c_len == MY_CS_ILUNI)
|
||||||
{
|
{
|
||||||
/*
|
return -1;
|
||||||
Result charset doesn't support the json's character.
|
|
||||||
Let's replace it with the '?' symbol.
|
|
||||||
*/
|
|
||||||
if ((c_len= my_ci_wc_mb(res_cs, '?', res, res_end)) > 0)
|
|
||||||
{
|
|
||||||
res+= c_len;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/* Result buffer is too small. */
|
/* Result buffer is too small. */
|
||||||
return -1;
|
return -1;
|
||||||
|
Reference in New Issue
Block a user