Fix incorrect initialization of mNextKeyID from storage (#6524)

Merge bypassing the 'Unit/Integration test report wait' - that report seems to be broken.
project-chip · Sep 8, 2021 · b6d3700 · b6d3700
1 parent 74a1352
commit b6d3700
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -641,8 +641,9 @@ CHIP_ERROR DeviceCommissioner::Init(NodeId localDeviceId, CommissionerInitParams
 {
     ReturnErrorOnFailure(DeviceController::Init(localDeviceId, params));
 
-    uint16_t size = sizeof(mNextKeyId);
-    if (!mStorageDelegate->SyncGetKeyValue(kNextAvailableKeyID, &mNextKeyId, size) || (size != sizeof(mNextKeyId)))
+    uint16_t size    = sizeof(mNextKeyId);
+    CHIP_ERROR error = mStorageDelegate->SyncGetKeyValue(kNextAvailableKeyID, &mNextKeyId, size);
+    if (error || (size != sizeof(mNextKeyId)))
     {
         mNextKeyId = 0;
     }