From 594c6b37f3dacf537e804c7a9264eeb4d84b5671 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Tue, 12 Sep 2017 13:26:03 +0400 Subject: MDEV-13138 JSON_OBJECT returns null with strings containing backticks. Condition was fixed. --- strings/json_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strings/json_lib.c') 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) { -- cgit v1.2.1