commit 5268655b66b658d40ed2b4f31307cf0ca0cf7e03
author Boris Zbarsky <bzbarsky@apple.com> Wed Jul 26 10:40:32 2023 -0400
committer GitHub <noreply@github.com> Wed Jul 26 14:40:32 2023 +0000
tree a575ec77f77f46a94c0152d36247bba4311f7687
parent 14bc386e23c8b9c9c837d383abfa95d35fe47b70

Make sure we clean up properly if StartWatchingSocket fails. (#28245)

If StartWatchingSocket failed (e.g. due to us being out of socket watch pool
space), we would leave the UDPEndPointImplSockets in a bad state where its
destructor would try to treat the un-initialized mWatch value as a pointer.

The fix is to make sure we clean up properly on StartWatchingSocket failure.

src/inet/UDPEndPointImplSockets.cpp

diff --git a/src/inet/UDPEndPointImplSockets.cpp b/src/inet/UDPEndPointImplSockets.cpp
index 5c9748d..b681a56 100644
--- a/src/inet/UDPEndPointImplSockets.cpp
+++ b/src/inet/UDPEndPointImplSockets.cpp
@@ -469,7 +469,14 @@
         {
             return CHIP_ERROR_POSIX(errno);
         }
-        ReturnErrorOnFailure(static_cast<System::LayerSockets *>(&GetSystemLayer())->StartWatchingSocket(mSocket, &mWatch));
+        CHIP_ERROR err = static_cast<System::LayerSockets *>(&GetSystemLayer())->StartWatchingSocket(mSocket, &mWatch);
+        if (err != CHIP_NO_ERROR)
+        {
+            // Our mWatch is not valid; make sure we never use it.
+            close(mSocket);
+            mSocket = kInvalidSocketFd;
+            return err;
+        }
 
         mAddrType = addressType;