Merge branch 'master' into 0307_good_lock

erwinpan1 · web-flow · commit 60774107ce13 · 2024-03-13T15:47:04.000+08:00
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1983,7 +1983,7 @@ void DeviceCommissioner::ParseCommissioningInfo()
     // return.
     auto attributeCache = std::move(mAttributeCache);
 
-    if (mPairingDelegate != nullptr)
+    if (mPairingDelegate != nullptr && err == CHIP_NO_ERROR)
     {
         mPairingDelegate->OnReadCommissioningInfo(info);
     }

Original file line number	Diff line number	Diff line change
`@@ -1983,7 +1983,7 @@ void DeviceCommissioner::ParseCommissioningInfo()`
`1983`	`1983`	`// return.`
`1984`	`1984`	`auto attributeCache = std::move(mAttributeCache);`
`1985`	`1985`
`1986`		`- if (mPairingDelegate != nullptr)`
	`1986`	`+ if (mPairingDelegate != nullptr && err == CHIP_NO_ERROR)`
`1987`	`1987`	`{`
`1988`	`1988`	`mPairingDelegate->OnReadCommissioningInfo(info);`
`1989`	`1989`	`}`