diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
| commit | 5a71e6bd5a61dff6d549d2c4f5927bbbd7ebcfee (patch) | |
| tree | 98ca05164f4a2bf2fce6e1644bc6335193e69bbd /strings/json_lib.c | |
| parent | 1710dd2bf286f9a240f380925a0067c57c1b29f9 (diff) | |
| parent | bf75dcac89d1496032015526dc6ce78d327e329f (diff) | |
| download | mariadb-git-bb-10-ext-mdev-13369.tar.gz | |
Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369bb-10-ext-mdev-13369
# Conflicts:
# mysql-test/r/derived_cond_pushdown.result
# mysql-test/t/derived_cond_pushdown.test
# sql/sql_derived.cc
# sql/sql_select.cc
# sql/sql_select.h
Diffstat (limited to 'strings/json_lib.c')
| -rw-r--r-- | strings/json_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index 0e2a17b0ae0..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; @@ -1756,7 +1756,7 @@ int json_path_parts_compare( goto step_fits; goto step_failed; } - if (a->n_item == 0) + if ((a->type & JSON_PATH_WILD) == 0 && a->n_item == 0) goto step_fits_autowrap; goto step_failed; } |