[TV] Add some null checks for both the TCP and the UDP enpoints to pr…

…event shutdown crashes
vivien-apple · Sep 30, 2024 · df3476f · df3476f
1 parent 6bbe1d6
commit df3476f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/inet/TCPEndPoint.cpp b/src/inet/TCPEndPoint.cpp
@@ -293,7 +293,10 @@ void TCPEndPoint::StartConnectTimerIfSet()
 
 void TCPEndPoint::StopConnectTimer()
 {
-    GetSystemLayer().CancelTimer(TCPConnectTimeoutHandler, this);
+    auto * systemLayer = &GetSystemLayer();
+    VerifyOrReturn(nullptr != systemLayer);
+
+    systemLayer->CancelTimer(TCPConnectTimeoutHandler, this);
 }
 
 void TCPEndPoint::TCPConnectTimeoutHandler(chip::System::Layer * aSystemLayer, void * aAppState)
@@ -464,7 +467,10 @@ void TCPEndPoint::StartTCPUserTimeoutTimer()
 
 void TCPEndPoint::StopTCPUserTimeoutTimer()
 {
-    GetSystemLayer().CancelTimer(TCPUserTimeoutHandler, this);
+    auto * systemLayer = &GetSystemLayer();
+    VerifyOrReturn(nullptr != systemLayer);
+
+    systemLayer->CancelTimer(TCPUserTimeoutHandler, this);
     mUserTimeoutTimerRunning = false;
 }
 

diff --git a/src/inet/TCPEndPointImplSockets.cpp b/src/inet/TCPEndPointImplSockets.cpp
@@ -619,7 +619,11 @@ void TCPEndPointImplSockets::DoCloseImpl(CHIP_ERROR err, State oldState)
                 }
             }
 
-            static_cast<System::LayerSockets &>(GetSystemLayer()).StopWatchingSocket(&mWatch);
+            auto * systemLayer = &GetSystemLayer();
+            if (nullptr != systemLayer)
+            {
+                static_cast<System::LayerSockets &>(GetSystemLayer()).StopWatchingSocket(&mWatch);
+            }
             close(mSocket);
             mSocket = kInvalidSocketFd;
         }

diff --git a/src/inet/UDPEndPointImplSockets.cpp b/src/inet/UDPEndPointImplSockets.cpp
@@ -434,7 +434,11 @@ void UDPEndPointImplSockets::CloseImpl()
 {
     if (mSocket != kInvalidSocketFd)
     {
-        static_cast<System::LayerSockets *>(&GetSystemLayer())->StopWatchingSocket(&mWatch);
+        auto * systemLayer = &GetSystemLayer();
+        if (nullptr != systemLayer)
+        {
+            static_cast<System::LayerSockets *>(systemLayer)->StopWatchingSocket(&mWatch);
+        }
         close(mSocket);
         mSocket = kInvalidSocketFd;
     }