diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-01 10:45:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-01 10:45:52 +0400 |
| commit | dc588e3d3fc0d3610ffb6f4e9c804dc539394669 (patch) | |
| tree | ab8dc4c2ca60ca0a795377471fbfea842b21dbe2 /strings | |
| parent | f1dcbc2d9a36b00fad4acee447b5c5066725fa7b (diff) | |
| parent | 7e44c455f4de82081af5089e1f77378676aa45ff (diff) | |
| download | mariadb-git-dc588e3d3fc0d3610ffb6f4e9c804dc539394669.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/json_lib.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index 9ab411345c8..bb8c15ee0c1 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -825,6 +825,11 @@ static int skip_colon(json_engine_t *j) static int skip_key(json_engine_t *j) { int t_next, c_len; + + if (json_instr_chr_map[j->s.c_next] == S_BKSL && + json_handle_esc(&j->s)) + return 1; + while (json_read_keyname_chr(j) == 0) {} if (j->s.error) |