Make DeviceCommissioner::OnNodeIdResolved same as master

project-chip · May 28, 2021 · c1a7cb0 · c1a7cb0
1 parent 811fb56
commit c1a7cb0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1526,9 +1526,10 @@ void BasicFailure(void * context, uint8_t status)
 #if CHIP_DEVICE_CONFIG_ENABLE_MDNS
 void DeviceCommissioner::OnNodeIdResolved(const chip::Mdns::ResolvedNodeData & nodeData)
 {
+    Device * device = nullptr;
     if (mDeviceBeingPaired < kNumMaxActiveDevices)
     {
-        Device * device = &mActiveDevices[mDeviceBeingPaired];
+        device = &mActiveDevices[mDeviceBeingPaired];
         if (device->GetDeviceId() == nodeData.mPeerId.GetNodeId() && mCommissioningStage == CommissioningStage::kFindOperational)
         {
             AdvanceCommissioningStage(CHIP_NO_ERROR);