[Tarantool-patches] [PATCH 2/2] tuple: fix access by JSON path starting from '[*]'
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Wed Aug 5 02:45:19 MSK 2020
Tuple JSON field access crashed when '[*]' was used as a first
part of the JSON path. The patch makes it treated like 'field not
found'.
Follow-up #5224
---
src/box/tuple.c | 3 ++-
test/box/gh-5224-multikey-field-access.result | 9 +++++++++
test/box/gh-5224-multikey-field-access.test.lua | 6 ++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/box/tuple.c b/src/box/tuple.c
index 9f0f24c64..e77753a5b 100644
--- a/src/box/tuple.c
+++ b/src/box/tuple.c
@@ -531,7 +531,8 @@ tuple_field_raw_by_full_path(struct tuple_format *format, const char *tuple,
break;
}
default:
- assert(token.type == JSON_TOKEN_END);
+ assert(token.type == JSON_TOKEN_END ||
+ token.type == JSON_TOKEN_ANY);
return NULL;
}
return tuple_field_raw_by_path(format, tuple, field_map, fieldno,
diff --git a/test/box/gh-5224-multikey-field-access.result b/test/box/gh-5224-multikey-field-access.result
index 014e810d0..20df44cc3 100644
--- a/test/box/gh-5224-multikey-field-access.result
+++ b/test/box/gh-5224-multikey-field-access.result
@@ -150,6 +150,15 @@ t['[2][3]']
| - {'p1': {'p2': 6}}
| ...
+--
+-- Multikey path part could crash when used as a first part of the path during
+-- accessing a tuple field.
+--
+t['[*]']
+ | ---
+ | - null
+ | ...
+
s:drop()
| ---
| ...
diff --git a/test/box/gh-5224-multikey-field-access.test.lua b/test/box/gh-5224-multikey-field-access.test.lua
index 19765171e..6f6691d3c 100644
--- a/test/box/gh-5224-multikey-field-access.test.lua
+++ b/test/box/gh-5224-multikey-field-access.test.lua
@@ -63,4 +63,10 @@ t['[2][3].p1.p2']
t['[2][3].p1']
t['[2][3]']
+--
+-- Multikey path part could crash when used as a first part of the path during
+-- accessing a tuple field.
+--
+t['[*]']
+
s:drop()
--
2.21.1 (Apple Git-122.3)
More information about the Tarantool-patches
mailing list