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

* 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 <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
project-chip · Apr 5, 2022 · 1030904 · 1030904
1 parent 727dbef
commit 1030904
Showing 1 changed file with 3 additions and 1 deletion.
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);