summaryrefslogtreecommitdiff
path: root/strings/json_lib.c
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-09 12:35:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-09 12:35:21 +0300
commit0930d6698fabc33a7b0dffaf13ff7a9e26fc6908 (patch)
treef229165bdbdcd8be17783904e53d3beadd69a902 /strings/json_lib.c
parent1f0a22acbd906f391ed7ead6cad5ef50b89236c1 (diff)
parent6b14fd6d6d75e09b966ddb0750ccfbb94a74a909 (diff)
downloadmariadb-git-0930d6698fabc33a7b0dffaf13ff7a9e26fc6908.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'strings/json_lib.c')
-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;