Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

logging/Manager: Non-null strings for empty strings

Browse source 
After #4724, empty strings would result in nullptrs being stored in the
threading::Value's string_val.data field instead of a valid pointer to
an empty strings. This upsets UBSAN's  nonnull check for memcpy()

    [01:29:45.807]   ../../src/SerializationFormat.cc:80:33: runtime error: null pointer passed as argument 2, which is declared to never be null
    [01:29:45.807]   /usr/include/string.h:44:28: note: nonnull attribute specified here
    [01:29:45.807]       #0 0x5b2e9c933a3f in zeek::detail::SerializationFormat::WriteData(void const*, unsigned long) /zeek/build/src/../../src/SerializationFormat.cc:80:5
    [01:29:45.807]       #1 0x5b2e9c935184 in zeek::detail::BinarySerializationFormat::Write(char const*, int, char const*) /zeek/build/src/../../src/SerializationFormat.cc:371:40

Continue to allocate the empty string for now as a fix.
This commit is contained in:
Arne Welzel 2025-08-19 14:52:06 +02:00
parent f6a369ec2b
commit 247931f2df
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/logging/Manager.cc
View file

@ -1511,9 +1511,6 @@ threading::Value Manager::ValToLogVal(WriterInfo* info, const Stream* stream, st
info->total_truncated_string_fields->Inc();
}
if ( allowed_bytes == 0 )
return lval;
char* buf = new char[allowed_bytes];
memcpy(buf, s->Bytes(), allowed_bytes);

5
src/threading/SerialTypes.cc
View file

@ -376,7 +376,10 @@ bool Value::Write(detail::SerializationFormat* fmt) const {
case TYPE_ENUM:
case TYPE_STRING:
case TYPE_FILE:
case TYPE_FUNC: return fmt->Write(val.string_val.data, val.string_val.length, "string");
case TYPE_FUNC: {
assert(val.string_val.data);
return fmt->Write(val.string_val.data, val.string_val.length, "string");
}
case TYPE_TABLE: {
if ( ! fmt->Write(val.set_val.size, "set_size") )