Browse Source

json_unescape: don't fill unconverted characters with ?

Return an error, and handle let the caller handler the SQL error.
remotes/origin/bb-10.11-MDEV-35694
Daniel Black 11 months ago
parent
commit
f699010c0f
  1. 10
      strings/json_lib.c

10
strings/json_lib.c

@ -1656,15 +1656,7 @@ int json_unescape(CHARSET_INFO *json_cs,
}
if (c_len == MY_CS_ILUNI)
{
/*
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;
}
return -1;
}
/* Result buffer is too small. */
return -1;

Loading…
Cancel
Save