From 109793251922c59ab46cf2b09f3a3b26d70782ca Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Fri, 16 Jun 2023 10:48:14 -0700
Subject: [PATCH] add checks for receiver and sender

---
 .../bdx/tests/TestBdxTransferSession.cpp      | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/protocols/bdx/tests/TestBdxTransferSession.cpp b/src/protocols/bdx/tests/TestBdxTransferSession.cpp
index e3de61cefdebfd..358a2a286641d6 100644
--- a/src/protocols/bdx/tests/TestBdxTransferSession.cpp
+++ b/src/protocols/bdx/tests/TestBdxTransferSession.cpp
@@ -170,8 +170,14 @@ void Reset()
     kSimulateBadAcceptMessageError = false;
     kSimulateDuplicateBlockError   = false;
     sBlockCopy                     = nullptr;
-    sBdxReceiver->Reset();
-    sBdxSender->Reset();
+    if (sBdxReceiver)
+    {
+        sBdxReceiver->Reset();
+    }
+    if (sBdxSender)
+    {
+        sBdxSender->Reset();
+    }
     sResponderExpectedOutputEvent = chip::bdx::TransferSession::OutputEvent(TransferSession::OutputEventType::kNone);
     sInitiatorExpectedOutputEvent = chip::bdx::TransferSession::OutputEvent(TransferSession::OutputEventType::kNone);
     sBdxReceiver                  = nullptr;
@@ -187,7 +193,7 @@ void OnResponderOutputEventReceived(void * context, TransferSession::OutputEvent
 {
     ChipLogProgress(BDX, "OnResponderOutputEventReceived %s", event.ToString(event.EventType));
     nlTestSuite * inSuite = static_cast<nlTestSuite *>(context);
-    if (inSuite == nullptr)
+    if (inSuite == nullptr || sBdxReceiver == nullptr || sBdxSender == nullptr)
     {
         return;
     }
@@ -342,7 +348,7 @@ void OnInitiatorOutputEventReceived(void * context, TransferSession::OutputEvent
 {
     ChipLogProgress(BDX, "OnInitiatorOutputEventReceived %s", event.ToString(event.EventType));
     nlTestSuite * inSuite = static_cast<nlTestSuite *>(context);
-    if (inSuite == nullptr)
+    if (inSuite == nullptr || sBdxReceiver == nullptr || sBdxSender == nullptr)
     {
         return;
     }
@@ -388,7 +394,10 @@ void OnInitiatorOutputEventReceived(void * context, TransferSession::OutputEvent
             }
         }
 
-        NL_TEST_ASSERT(inSuite, sBdxSender != nullptr && sBdxReceiver != nullptr);
+        if (sBdxReceiver == nullptr || sBdxSender == nullptr)
+        {
+            break;
+        }
         // Verify that MaxBlockSize was set appropriately
         NL_TEST_ASSERT(inSuite, sBdxReceiver->GetTransferBlockSize() <= kProposedBlockSize);
 
@@ -431,6 +440,11 @@ void OnInitiatorOutputEventReceived(void * context, TransferSession::OutputEvent
 
 bool RespondToLastInitiatorOutputEvent(nlTestSuite * inSuite)
 {
+    if (sBdxReceiver == nullptr || sBdxSender == nullptr)
+    {
+        return false;
+    }
+
     switch (sLastInitiatorOutputEvent.EventType)
     {
     case TransferSession::OutputEventType::kMsgToSend: {
@@ -784,7 +798,7 @@ void SendAcceptTransferForInitReceived(nlTestSuite * inSuite)
     {
         acceptData.ControlMode = TransferControlFlags::kSenderDrive;
     }
-    else
+    else if (sBdxReceiver != nullptr)
     {
         acceptData.ControlMode = sBdxReceiver->GetControlMode();
     }