diff options
author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-09-12 13:26:03 +0400 |
---|---|---|
committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-09-12 13:26:03 +0400 |
commit | 594c6b37f3dacf537e804c7a9264eeb4d84b5671 (patch) | |
tree | ac73a571d1e2f398cbfe7dc00f17a36241a6beec /strings | |
parent | 66a09bd6aba0f7b74492d198146bb8d47cdd9dbb (diff) | |
download | mariadb-git-594c6b37f3dacf537e804c7a9264eeb4d84b5671.tar.gz |
MDEV-13138 JSON_OBJECT returns null with strings containing backticks.
Condition was fixed.
Diffstat (limited to 'strings')
-rw-r--r-- | strings/json_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index b0c843caec1..25e5e81e6f9 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -1586,7 +1586,7 @@ int json_escape(CHARSET_INFO *str_cs, enum json_esc_char_classes c_class; str+= c_len; - if (c_chr > 0x60 || (c_class= json_escape_chr_map[c_chr]) == ESC_) + if (c_chr >= 0x60 || (c_class= json_escape_chr_map[c_chr]) == ESC_) { if ((c_len= json_cs->cset->wc_mb(json_cs, c_chr, json, json_end)) > 0) { |