MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed in

json_find_path. The ..[0] path can be treated wrong on second json_find_path call.
MariaDB · May 2, 2017 · 4a484e7 · 4a484e7
1 parent 42ad4f2
commit 4a484e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
@@ -633,3 +633,6 @@ SET @str = 'bar', @path = '$';
 SELECT JSON_SEARCH('{"foo":"bar"}', 'all' , @str, '%', @path);
 JSON_SEARCH('{"foo":"bar"}', 'all' , @str, '%', @path)
 "$.foo"
+SELECT JSON_VALUE('[{"foo": 1},"bar"]', '$[*][0]');
+JSON_VALUE('[{"foo": 1},"bar"]', '$[*][0]')
+bar
diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test
@@ -281,3 +281,9 @@ drop table t1;
 SET @str = 'bar', @path = '$';
 SELECT JSON_SEARCH('{"foo":"bar"}', 'all' , @str, '%', @path);
 
+#
+# MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed in json_find_path.
+#
+
+SELECT JSON_VALUE('[{"foo": 1},"bar"]', '$[*][0]');
+
diff --git a/strings/json_lib.c b/strings/json_lib.c
@@ -1248,6 +1248,7 @@ static int handle_match(json_engine_t *je, json_path_t *p,
       if (++next_step > p->last_step)
       {
         je->s.c_str= je->value_begin;
+        je->stack_p--;
         return 1;
       }
     } while (next_step->type == JSON_PATH_ARRAY && next_step->n_item == 0);