summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2017-08-08 10:35:26 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2017-08-08 10:35:26 +0400
commitbb71d9abf26aa5a0f8bb703d4541e3c064eed003 (patch)
treebf38c69ddd9ae0dd09301584dd42a01361fa624e /strings
parent86e0a73eaa166f752d62b31e96925e29c4fe0c8c (diff)
downloadmariadb-git-bb71d9abf26aa5a0f8bb703d4541e3c064eed003.tar.gz
MDEV-12604 Comparison of JSON_EXTRACT result differs with Mysql.
Comparison fixed to take the actual type of JSON value into account. Bug in escaping handling fixed.
Diffstat (limited to 'strings')
-rw-r--r--strings/json_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c
index 7167b6a2a54..b0c843caec1 100644
--- a/strings/json_lib.c
+++ b/strings/json_lib.c
@@ -253,7 +253,7 @@ static int read_4_hexdigits(json_string_t *s, uchar *dest)
if ((c_len= json_next_char(s)) <= 0)
return s->error= json_eos(s) ? JE_EOS : JE_BAD_CHR;
- if (s->c_next >= 128 || (t= json_instr_chr_map[s->c_next]) >= S_F)
+ if (s->c_next >= 128 || (t= json_instr_chr_map[s->c_next]) > S_F)
return s->error= JE_SYN;
s->c_str+= c_len;