diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 16:36:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 16:36:46 +0300 |
| commit | d28686ada6f72035f23b83960e63599f50fbc38d (patch) | |
| tree | c7295d08ffa9f27d7f8b19b5741b286acaa40b9b /strings | |
| parent | 9d26f3dabb8299149af99faafa52398cce44e610 (diff) | |
| parent | 60c04be6599597548ad07ce11e1d7d4004a7cc9c (diff) | |
| download | mariadb-git-d28686ada6f72035f23b83960e63599f50fbc38d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/json_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index 11ca6f61322..b00d0e29626 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -320,15 +320,17 @@ static int json_handle_esc(json_string_t *s) if (s->c_next != '\\') return s->error= JE_SYN; + s->c_str+= c_len; if ((c_len= json_next_char(s)) <= 0) return s->error= json_eos(s) ? JE_EOS : JE_BAD_CHR; if (s->c_next != 'u') return s->error= JE_SYN; + s->c_str+= c_len; if (read_4_hexdigits(s, code+2)) return 1; - if ((c_len= my_utf16_uni(0, &s->c_next, code, code+4)) == 2) + if ((c_len= my_utf16_uni(0, &s->c_next, code, code+4)) == 4) return 0; } return s->error= JE_BAD_CHR; |