From b1e517e86367ad06d0af3ee21b97a7132982075d Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 14 Oct 2020 12:37:32 -0700 Subject: [PATCH] Prevent String::Set from crashing if passed a nullptr --- src/ZeekString.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ZeekString.cc b/src/ZeekString.cc index 350d712a01..5a034ada03 100644 --- a/src/ZeekString.cc +++ b/src/ZeekString.cc @@ -132,11 +132,14 @@ void String::Set(const char* str) { Reset(); - n = strlen(str); - b = new u_char[n+1]; - memcpy(b, str, n+1); - final_NUL = true; - use_free_to_delete = false; + if ( str ) + { + n = strlen(str); + b = new u_char[n+1]; + memcpy(b, str, n+1); + final_NUL = true; + use_free_to_delete = false; + } } void String::Set(const std::string& str)