diff options
author | William Langford <wlangfor@gmail.com> | 2019-02-22 19:33:24 -0500 |
---|---|---|
committer | Nico Williams <nico@cryptonector.com> | 2019-02-26 11:10:38 -0600 |
commit | f951d0241c8808ae6c0672dca7d51fec28c9fb9f (patch) | |
tree | badbbb8ea958eb7bd0c511c5aeec693b7cf0e678 | |
parent | cc724f105d9bac5abd4ba98e3bb85795f7e9f380 (diff) |
Change contains to return true for empty string needles
The behavior of memmem for an empty needle is inconsistent between
implementations of libc.
Our tests imply that we want an empty string needle to be true,
so check for an empty needle before calling memmem.
-rw-r--r-- | src/jv.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1344,8 +1344,13 @@ 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 = _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; + int b_len = jv_string_length_bytes(jv_copy(b)); + if (b_len != 0) { + r = _jq_memmem(jv_string_value(a), jv_string_length_bytes(jv_copy(a)), + jv_string_value(b), b_len) != 0; + } else { + r = 1; + } } else { r = jv_equal(jv_copy(a), jv_copy(b)); } |