generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-14 02:57:45 +01:00
Code Issues Projects Releases Wiki Activity

fix nullptr passed to memcmp/memcpy reported by ubsan

Browse Source
This commit is contained in:
Günter Obiltschnig 2021-06-24 07:49:45 +02:00
parent 4508514666
commit 230812093b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/include/Poco/Buffer.h
View File

@ -159,7 +159,7 @@ public:
if (newCapacity > _capacity) if (newCapacity > _capacity)
{ {
T* ptr = new T[newCapacity]; T* ptr = new T[newCapacity];
if (preserveContent) if (preserveContent && _ptr)
{ {
std::memcpy(ptr, _ptr, _used * sizeof(T)); std::memcpy(ptr, _ptr, _used * sizeof(T));
} }
@ -266,10 +266,11 @@ public:
{ {
if (_used == other._used) if (_used == other._used)
{ {
if (std::memcmp(_ptr, other._ptr, _used * sizeof(T)) == 0) if (_ptr && other._ptr && std::memcmp(_ptr, other._ptr, _used * sizeof(T)) == 0)
{ {
return true; return true;
} }
else return _used == 0;
} }
return false; return false;
} }