Added checks

Author: rosahay-silabs

examples/platform/silabs/SiWx917/SiWx917/wfx_rsi_host.cpp

@@ -156,14 +156,13 @@ void wfx_clear_wifi_provision(void)
  * @brief
  * Start a JOIN command to the AP - Done by the wfx_rsi task
  * @param[in]   None
- * @return  returns SL_STATUS_OK if successful,
- *         SL_STATUS_INVALID_CONFIGURATION otherwise
+ * @return  returns SL_STATUS_OK if successful
  ****************************************************************************/
 sl_status_t wfx_connect_to_ap(void)
 {
     VerifyOrReturnError(wfx_rsi.dev_state & WFX_RSI_ST_STA_PROVISIONED, SL_STATUS_INVALID_CONFIGURATION);
-    // TODO: check for '\0' in SSID before printing
-    ChipLogProgress(DeviceLayer, "Connect to access point: %s", wfx_rsi.sec.ssid);
+    VerifyOrReturnError(strlen(wfx_rsi.sec.ssid) <= WFX_MAX_SSID_LENGTH, SL_STATUS_HAS_OVERFLOWED);
+    ChipLogProgress(DeviceLayer, "connect to access point: %s", wfx_rsi.sec.ssid);
     WfxEvent_t event;
     event.eventType = WFX_EVT_STA_START_JOIN;
     WfxPostEvent(&event);

examples/platform/silabs/efr32/rs911x/rsi_if.c

@@ -744,11 +744,13 @@ void ProcessEvent(WfxEvent_t inEvent)
             // is it a scan all or target scan
             if (!wfx_rsi.scan_ssid || (wfx_rsi.scan_ssid && strcmp(wfx_rsi.scan_ssid, (char *) scan->ssid) == CMP_SUCCESS))
             {
-                strncpy(ap.ssid, (char *) scan->ssid, MIN(sizeof(ap.ssid), sizeof(scan->ssid)));
+                // clear structure and calculate size of SSID
+                memset(ap, 0, sizeof(ap));
+                strncpy(ap.ssid, (char *) scan->ssid, strnlen(scan->ssid, WFX_MAX_SSID_LENGTH));
                 ap.security = scan->security_mode;
                 ap.rssi     = (-1) * scan->rssi_val;
-                configASSERT(sizeof(ap.bssid) >= BSSID_LEN);
-                configASSERT(sizeof(scan->bssid) >= BSSID_LEN);
+
+                VerifyOrDie(sizeof(ap.bssid) == BSSID_LEN && sizeof(scan->bssid) == BSSID_LEN);
                 memcpy(ap.bssid, scan->bssid, BSSID_LEN);
                 (*wfx_rsi.scan_cb)(&ap);
 
@@ -760,13 +762,13 @@ void ProcessEvent(WfxEvent_t inEvent)
         }
 
         /* Terminate with end of scan which is no ap sent back */
-        (*wfx_rsi.scan_cb)((wfx_wifi_scan_result_t *) 0);
-        wfx_rsi.scan_cb = (void (*)(wfx_wifi_scan_result_t *)) 0;
+        (*wfx_rsi.scan_cb)((wfx_wifi_scan_result_t *) NULL);
+        wfx_rsi.scan_cb = NULL;
 
         if (wfx_rsi.scan_ssid)
         {
             vPortFree(wfx_rsi.scan_ssid);
-            wfx_rsi.scan_ssid = (char *) 0;
+            wfx_rsi.scan_ssid = NULL;
         }
         break;
 #endif /* SL_WFX_CONFIG_SCAN */

examples/platform/silabs/efr32/rs911x/wfx_rsi_host.cpp

@@ -159,13 +159,12 @@ void wfx_clear_wifi_provision(void)
  * @brief
  * Start a JOIN command to the AP - Done by the wfx_rsi task
  * @param[in]   None
- * @return  returns SL_STATUS_OK if successful,
- *         SL_STATUS_INVALID_CONFIGURATION otherwise
+ * @return  returns SL_STATUS_OK if successful
  ****************************************************************************/
 sl_status_t wfx_connect_to_ap(void)
 {
     VerifyOrReturnError(wfx_rsi.dev_state & WFX_RSI_ST_STA_PROVISIONED, SL_STATUS_INVALID_CONFIGURATION);
-    VerifyOrReturnError(strlen(wfx_rsi.sec.ssid) <= WFX_MAX_SSID_LENGTH, SL_STATUS_WOULD_OVERFLOW);
+    VerifyOrReturnError(strlen(wfx_rsi.sec.ssid) <= WFX_MAX_SSID_LENGTH, SL_STATUS_HAS_OVERFLOWED);
     ChipLogProgress(DeviceLayer, "connect to access point: %s", wfx_rsi.sec.ssid);
     WfxEvent_t event;
     event.eventType = WFX_EVT_STA_START_JOIN;