database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-11562 Assertion `js->state == JST_VALUE' failed in check_contains(json_engine_t*, json_engine_t*).

Browse Source 
check_contains() fixed. When an item of an array is a complex
        structure, it can be half-read after the end of the recursive
        check_contains() call. So we just manually get to it's ending.
This commit is contained in:
Alexey Botchkov
2016-12-16 12:32:56 +04:00
parent 8938031bc7
commit e5377be211
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/json_lib.h
View File

@@ -295,13 +295,27 @@ int json_read_value(json_engine_t *j);
int json_skip_key(json_engine_t *j);
typedef const int *json_level_t;
/*
json_skip_level() makes parser quickly skip the JSON content
to the end of the current object or array.
It is used when we're not interested in the rest of an array
or the rest of the keys of an object.
json_skip_to_level() makes parser quickly get out of nested
loops and arrays. It is used when we're not interested in what is
there in the rest of these structures.
The 'level' should be remembered in advance.
json_level_t level= json_get_level(j);
.... // getting into the nested JSON structures
json_skip_to_level(j, level);
*/
int json_skip_level(json_engine_t *j);
#define json_get_level(j) (j->stack_p)
int json_skip_to_level(json_engine_t *j, json_level_t level);
/*
json_skip_level() works as above with just current structre.
So it gets to the end of the current JSON array or object.
*/
#define json_skip_level(json_engine) \
json_skip_to_level((json_engine), (json_engine)->stack_p)
#define json_skip_array_item json_skip_key