From 271d3c40384dfd9a201563fd11f6520f31a1ef99 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 25 May 2022 17:03:26 -0700 Subject: [PATCH] GH-2054: Allow nulls as separators for join_string_vec --- src/strings.bif | 2 +- testing/btest/Baseline/bifs.join_string/out | 1 + testing/btest/bifs/join_string.zeek | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/strings.bif b/src/strings.bif index 11a38deaa3..1d7ba96536 100644 --- a/src/strings.bif +++ b/src/strings.bif @@ -102,7 +102,7 @@ function join_string_vec%(vec: string_vec, sep: string%): string for ( unsigned i = 0; i < v->Size(); ++i ) { if ( i > 0 ) - d.Add(sep->CheckString(), 0); + d.AddN(reinterpret_cast(sep->Bytes()), sep->Len()); auto e = v->ValAt(i); diff --git a/testing/btest/Baseline/bifs.join_string/out b/testing/btest/Baseline/bifs.join_string/out index 2e60ee2516..a175b0b202 100644 --- a/testing/btest/Baseline/bifs.join_string/out +++ b/testing/btest/Baseline/bifs.join_string/out @@ -3,3 +3,4 @@ this__is__another__test thisisanothertest Test ...hi..there +this\x00is\x00another\x00test diff --git a/testing/btest/bifs/join_string.zeek b/testing/btest/bifs/join_string.zeek index 9cac2faa0d..4ea08a11ed 100644 --- a/testing/btest/bifs/join_string.zeek +++ b/testing/btest/bifs/join_string.zeek @@ -18,4 +18,5 @@ event zeek_init() print join_string_vec(c, ""); print join_string_vec(d, "-"); print join_string_vec(e, "."); + print join_string_vec(c, "\x00"); }