sysutils/jq
1
0
Fork 0
mirror of https://github.com/jqlang/jq.git synced 2025-11-03 12:33:13 +03:00
Code Activity

contains should handle embedded NULs (fix #1732)

Browse Source
This commit is contained in:
Nicolas Williams
2019-01-18 22:33:46 -06:00
parent 4b4fefa254
commit 61cd6dbb3b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/jv.c
View File

@@ -1342,7 +1342,8 @@ int jv_contains(jv a, jv b) {
} else if (jv_get_kind(a) == JV_KIND_ARRAY) {
r = jv_array_contains(jv_copy(a), jv_copy(b));
} else if (jv_get_kind(a) == JV_KIND_STRING) {
r = strstr(jv_string_value(a), jv_string_value(b)) != 0;
r = _jq_memmem(jv_string_value(a), jv_string_length_bytes(jv_copy(a)),
jv_string_value(b), jv_string_length_bytes(jv_copy(b))) != 0;
} else {
r = jv_equal(jv_copy(a), jv_copy(b));
}

5
tests/jq.test
View File

@@ -1091,6 +1091,11 @@ null
{}
[true, true, false]
# containment operator (embedded NULs!)
[contains("foo"), contains("\u0000b"), contains("\u0000z"), contains("bar"), contains("baz")]
"foo\u0000bar"
[true, true, false, true, false]
# Try/catch and general `?` operator
[.[]|try if . == 0 then error("foo") elif . == 1 then .a elif . == 2 then empty else . end catch .]
[0,1,2,3]