[wifi] dont store wifi info in kvs if ssid is empty (project-chip#24719)

- also initialize WifiNetwork structs to empty
lecndav · Mar 22, 2023 · 262c794 · 262c794
1 parent 1e2382c
commit 262c794
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/platform/Ameba/AmebaUtils.cpp b/src/platform/Ameba/AmebaUtils.cpp
@@ -76,6 +76,12 @@ CHIP_ERROR AmebaUtils::EnableStationMode(void)
 CHIP_ERROR AmebaUtils::SetWiFiConfig(rtw_wifi_config_t * config)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
+    // don't store if ssid is null
+    if (config->ssid[0] == 0)
+    {
+        return CHIP_NO_ERROR;
+    }
+
     /* Store Wi-Fi Configurations in Storage */
     err = PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, config->ssid, sizeof(config->ssid));
     SuccessOrExit(err);

diff --git a/src/platform/Ameba/NetworkCommissioningDriver.h b/src/platform/Ameba/NetworkCommissioningDriver.h
@@ -127,8 +127,8 @@ class AmebaWiFiDriver final : public WiFiDriver
     bool NetworkMatch(const WiFiNetwork & network, ByteSpan networkId);
     CHIP_ERROR StartScanWiFiNetworks(ByteSpan ssid);
 
-    WiFiNetwork mSavedNetwork;
-    WiFiNetwork mStagingNetwork;
+    WiFiNetwork mSavedNetwork   = { 0 };
+    WiFiNetwork mStagingNetwork = { 0 };
     ScanCallback * mpScanCallback;
     ConnectCallback * mpConnectCallback;
     NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;