Ensure we don't get an NPE if the Stack is missing

(cherry picked from commit 54d2743)
peternewman · Apr 21, 2024 · 7826970 · 7826970
1 parent fd24823
commit 7826970
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/libs/acn/LLRPProbeReplyPDU.cpp b/libs/acn/LLRPProbeReplyPDU.cpp
@@ -57,6 +57,11 @@ void LLRPProbeReplyPDU::PrependPDU(ola::io::IOStack *stack,
                                    const UID &target_uid,
                                    const MACAddress &hardware_address,
                                    const LLRPComponentType type) {
+  if (!stack) {
+    OLA_WARN << "LLRPProbeReplyPDU::PrependPDU: missing stack";
+    return;
+  }
+
   llrp_probe_reply_pdu_data data;
   target_uid.Pack(data.target_uid, sizeof(data.target_uid));
   hardware_address.Pack(data.hardware_address, sizeof(data.hardware_address));

diff --git a/libs/acn/LLRPProbeReplyPDUTest.cpp b/libs/acn/LLRPProbeReplyPDUTest.cpp
@@ -176,6 +176,14 @@ void LLRPProbeReplyPDUTest::testPrepend() {
     0xff
   };
   OLA_ASSERT_DATA_EQUALS(expected_data, sizeof(expected_data), buffer, length);
+
+  // test null stack
+  LLRPProbeReplyPDU::PrependPDU(
+      NULL,
+      target_uid,
+      hardware_address,
+      LLRPProbeReplyPDU::LLRP_COMPONENT_TYPE_NON_RDMNET);
+
   delete[] buffer;
 }
 }  // namespace acn

diff --git a/libs/acn/LLRPProbeRequestPDU.cpp b/libs/acn/LLRPProbeRequestPDU.cpp
@@ -87,6 +87,11 @@ void LLRPProbeRequestPDU::PrependPDU(ola::io::IOStack *stack,
                                      bool client_tcp_connection_inactive,
                                      bool brokers_only,
                                      const ola::rdm::UIDSet &known_uids) {
+  if (!stack) {
+    OLA_WARN << "LLRPProbeRequestPDU::PrependPDU: missing stack";
+    return;
+  }
+
   llrp_probe_request_pdu_data data;
   lower_uid.Pack(data.lower_uid, sizeof(data.lower_uid));
   upper_uid.Pack(data.upper_uid, sizeof(data.upper_uid));

diff --git a/libs/acn/LLRPProbeRequestPDUTest.cpp b/libs/acn/LLRPProbeRequestPDUTest.cpp
@@ -191,6 +191,15 @@ void LLRPProbeRequestPDUTest::testPrepend() {
     0x56, 0x78, 0, 0, 0, 2,
   };
   OLA_ASSERT_DATA_EQUALS(expected_data, sizeof(expected_data), buffer, length);
+
+  // test null stack
+  LLRPProbeRequestPDU::PrependPDU(NULL,
+                                  UID(0x0000, 0x00000000),
+                                  UID(0xffff, 0xffffffff),
+                                  false,
+                                  false,
+                                  known_uids);
+
   delete[] buffer;
 }
 }  // namespace acn