Resolve default countryCodeSize when not set on commissioner (#16724)

adabreuti · bzbarsky-apple · pull[bot] · commit 779589a9e449 · 2022-04-15T22:23:04.000Z
* Resolve default countryCodeSize when not set on commissioner

* Re-initialize countrycodestr on failure

* Generalize print

* Update src/controller/CHIPDeviceController.cpp

Co-authored-by: Boris Zbarsky &lt;bzbarsky@apple.com&gt;

Co-authored-by: Boris Zbarsky &lt;bzbarsky@apple.com&gt;
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1723,7 +1723,9 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
 #endif
         if (status != CHIP_NO_ERROR)
         {
-            ChipLogError(Controller, "Unable to find country code, defaulting to XX");
+            actualCountryCodeSize = 2;
+            memset(countryCodeStr, 'X', actualCountryCodeSize);
+            ChipLogError(Controller, "Unable to find country code, defaulting to %s", countryCodeStr);
         }
         chip::CharSpan countryCode(countryCodeStr, actualCountryCodeSize);
 

Original file line number	Diff line number	Diff line change
`@@ -1723,7 +1723,9 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio`
`1723`	`1723`	`#endif`
`1724`	`1724`	`if (status != CHIP_NO_ERROR)`
`1725`	`1725`	`{`
`1726`		`- ChipLogError(Controller, "Unable to find country code, defaulting to XX");`
	`1726`	`+ actualCountryCodeSize = 2;`
	`1727`	`+ memset(countryCodeStr, 'X', actualCountryCodeSize);`
	`1728`	`+ ChipLogError(Controller, "Unable to find country code, defaulting to %s", countryCodeStr);`
`1727`	`1729`	`}`
`1728`	`1730`	`chip::CharSpan countryCode(countryCodeStr, actualCountryCodeSize);`
`1729`	`1731`