Conditional freeing of rendezvous session when trying to unpair device (

#5958) * Conditional freeing of rendezvous session when trying to unpair device * Address review comment * Add extra check for mDeviceBeingPaired
project-chip · Apr 14, 2021 · 1a369d5 · 1a369d5
1 parent 7d33476
commit 1a369d5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -805,7 +805,16 @@ CHIP_ERROR DeviceCommissioner::UnpairDevice(NodeId remoteDeviceId)
 {
     // TODO: Send unpairing message to the remote device.
 
-    FreeRendezvousSession();
+    VerifyOrReturnError(mState == State::Initialized, CHIP_ERROR_INCORRECT_STATE);
+
+    if (mDeviceBeingPaired < kNumMaxActiveDevices)
+    {
+        Device * device = &mActiveDevices[mDeviceBeingPaired];
+        if (device->GetDeviceId() == remoteDeviceId)
+        {
+            FreeRendezvousSession();
+        }
+    }
 
     if (mStorageDelegate != nullptr)
     {