Fix potential nullptr deref in free_PacketInfo_ptr

diff --git a/src/UDPConnection.cpp b/src/UDPConnection.cpp
index b8b0f22deef4dc600a6db6fc46eca3ef2f90da95..8f9e32728314e0937cf5026d4f93964d8ea75a23 100644 (file)
--- a/src/UDPConnection.cpp
+++ b/src/UDPConnection.cpp
@@ -2500,7 +2500,7 @@ void UDPC_free_PacketInfo(UDPC_PacketInfo pInfo) {
 }
 
 void UDPC_free_PacketInfo_ptr(UDPC_PacketInfo *pInfoPtr) {
-    if (pInfoPtr->data && pInfoPtr->dataSize > 0) {
+    if (pInfoPtr && pInfoPtr->data && pInfoPtr->dataSize > 0) {
         std::free(pInfoPtr->data);
         pInfoPtr->data = nullptr;
         pInfoPtr->dataSize = 0;

diff --git a/src/test/TestUDPC.cpp b/src/test/TestUDPC.cpp
index 75ba9766c803b6340acc8caad2cd1d7d4de72c70..37bd7198cfa28ae9fbdb56348823c5c71a668b76 100644 (file)
--- a/src/test/TestUDPC.cpp
+++ b/src/test/TestUDPC.cpp
@@ -337,4 +337,5 @@ TEST(UDPC, free_packet_ptr) {
 
     UDPC_free_PacketInfo_ptr(&pinfo);
     UDPC_free_PacketInfo_ptr(&pinfo);
+    UDPC_free_PacketInfo_ptr(nullptr);
 }