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

Avoid passing null pointers to memcmp in ZeekString comparison methods

Browse source
This commit is contained in:
Jon Siwek 2020-10-16 10:28:11 -07:00
parent 65125121d8
commit 72b3a4244e
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ZeekString.cc
View file

@ -411,13 +411,19 @@ int Bstr_eq(const String* s1, const String* s2)
if ( s1->Len() != s2->Len() ) if ( s1->Len() != s2->Len() )
return 0; return 0;
if ( ! s1->Bytes() || ! s2->Bytes() )
// memcmp() arguments should never be null, so help avoid that
return s1->Bytes() == s2->Bytes();
return memcmp(s1->Bytes(), s2->Bytes(), s1->Len()) == 0; return memcmp(s1->Bytes(), s2->Bytes(), s1->Len()) == 0;
} }
int Bstr_cmp(const String* s1, const String* s2) int Bstr_cmp(const String* s1, const String* s2)
{ {
int n = std::min(s1->Len(), s2->Len()); int n = std::min(s1->Len(), s2->Len());
int cmp = memcmp(s1->Bytes(), s2->Bytes(), n); // memcmp() arguments should never be null, so help avoid that
// (assuming that we only ever have null pointers when lengths are zero).
int cmp = n == 0 ? 0 : memcmp(s1->Bytes(), s2->Bytes(), n);
if ( cmp || s1->Len() == s2->Len() ) if ( cmp || s1->Len() == s2->Len() )
return cmp; return cmp;