fix memory leak when error happens when initilizing rendezvous (#2784)

project-chip · Sep 24, 2020 · 5d54534 · 5d54534
1 parent 354ef15
commit 5d54534
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -151,8 +151,8 @@ CHIP_ERROR ChipDeviceController::ConnectDevice(NodeId remoteDeviceId, Rendezvous
                                                NewConnectionHandler onConnected, MessageReceiveHandler onMessageReceived,
                                                ErrorHandler onError)
 {
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    RendezvousSession * rendezvousSession;
+    CHIP_ERROR err                        = CHIP_NO_ERROR;
+    RendezvousSession * rendezvousSession = nullptr;
 
     VerifyOrExit(mState == kState_Initialized, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(mConState == kConnectionState_NotConnected, err = CHIP_ERROR_INCORRECT_STATE);
@@ -181,6 +181,11 @@ CHIP_ERROR ChipDeviceController::ConnectDevice(NodeId remoteDeviceId, Rendezvous
     mOnError             = onError;
 
 exit:
+    if (err != CHIP_NO_ERROR && rendezvousSession != nullptr)
+    {
+        delete rendezvousSession;
+    }
+
     return err;
 }