commit ad343179bf8d6a875dbf31bf530bd286989d83b3
author Song GUO <songguo@google.com> Fri Dec 08 04:39:16 2023 +0800
committer GitHub <noreply@github.com> Thu Dec 07 20:39:16 2023 +0000
tree af6b63f6cd4f6193e348e6bc6599272b66d82c55
parent 575d6000190b2d9808c0f2875ae609d2c959ebba

[controller] fix 30260 (#30864)

src/controller/AutoCommissioner.cpp

diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index 93247c3..82286e3 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -828,10 +828,10 @@
             return NOCChainGenerated(report.Get<NocChain>().noc, report.Get<NocChain>().icac, report.Get<NocChain>().rcac,
                                      report.Get<NocChain>().ipk, report.Get<NocChain>().adminSubject);
         case CommissioningStage::kICDGetRegistrationInfo:
-            // Noting to od. The ICD registation info is handled elsewhere.
+            // Noting to do. The ICD registation info is handled elsewhere.
             break;
         case CommissioningStage::kICDRegistration:
-            // Noting to od. DevicePairingDelegate will handle this.
+            // Noting to do. DevicePairingDelegate will handle this.
             break;
         case CommissioningStage::kICDSendStayActive:
             // Nothing to do.

src/controller/CHIPDeviceController.cpp

diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 1713564..4959196 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -1177,19 +1177,25 @@
     void * context, const app::Clusters::IcdManagement::Commands::RegisterClientResponse::DecodableType & data)
 {
     DeviceCommissioner * commissioner = static_cast<DeviceCommissioner *>(context);
+    VerifyOrReturn(commissioner != nullptr, ChipLogProgress(Controller, "Command response callback with null context. Ignoring"));
 
+    if (commissioner->mCommissioningStage != CommissioningStage::kICDRegistration)
+    {
+        return;
+    }
+
+    if (commissioner->mDeviceBeingCommissioned == nullptr)
+    {
+        return;
+    }
+
+    if (commissioner->mPairingDelegate != nullptr)
+    {
+        commissioner->mPairingDelegate->OnICDRegistrationComplete(commissioner->mDeviceBeingCommissioned->GetDeviceId(),
+                                                                  data.ICDCounter);
+    }
     CommissioningDelegate::CommissioningReport report;
-    auto pairingDelegate         = commissioner->GetPairingDelegate();
-    auto deviceBeingCommissioned = commissioner->mDeviceBeingCommissioned;
-    if (pairingDelegate != nullptr && deviceBeingCommissioned != nullptr)
-    {
-        pairingDelegate->OnICDRegistrationComplete(deviceBeingCommissioned->GetDeviceId(), data.ICDCounter);
-        commissioner->CommissioningStageComplete(CHIP_NO_ERROR, report);
-    }
-    else
-    {
-        commissioner->CommissioningStageComplete(CHIP_ERROR_INCORRECT_STATE, report);
-    }
+    commissioner->CommissioningStageComplete(CHIP_NO_ERROR, report);
 }
 
 bool DeviceCommissioner::ExtendArmFailSafe(DeviceProxy * proxy, CommissioningStage step, uint16_t armFailSafeTimeout,