RDKB-63101: Fixing coverity issues

source/dml/tr_181/sbapi/cosa_wifi_apis.c

@@ -766,10 +766,14 @@ int readRemoteIP(char *sIP, int size,char *sName)
 
                 // grab URL from string
                 urlPtr = strstr(buf, "=");
+                if (urlPtr == NULL) {
+                    fclose(fp1);
+                    return -1;
+                }
                 urlPtr++;
                 strncpy(sIP, urlPtr, size);
-              ret=0;
-              break;
+                ret=0;
+                break;
             }
         }
 

source/sampleapps/webconfig_consumer_apis.c

@@ -1645,7 +1645,7 @@ void consumer_app_all_test_sequence(webconfig_consumer_t *consumer)
             consumer->xfinity_test_pending_count++;
             if (consumer->xfinity_test_pending_count > MAX_WAIT) {
                 printf("%s:%d: vap xfinity test failed, timed out, proceeding with home test\n", __func__, __LINE__);
-                consumer->mesh_test_pending_count = 0;
+                consumer->xfinity_test_pending_count = 0;
                 consumer->test_state = consumer_test_state_xfinity_subdoc_test_complete;
             }
             break;

source/sampleapps/webconfig_consumer_cli.c

@@ -71,7 +71,7 @@ char *read_subdoc_input_param_from_file(char *file_path)
 {
     FILE *file_ptr = NULL;
     char *read_data = NULL;
-    unsigned int data_len = 0;
+    long data_len = 0;
     // Opening file in reading mode
     file_ptr = fopen(file_path, "r");
     if (file_ptr == NULL) {
@@ -80,6 +80,11 @@ char *read_subdoc_input_param_from_file(char *file_path)
     } else {
         fseek(file_ptr, 0, SEEK_END);
         data_len = ftell(file_ptr);
+        if (data_len < 0) {
+            printf("%s:%d Failed to get file size:%s\r\n", __func__, __LINE__, file_path);
+            fclose(file_ptr);
+            return NULL;
+        }
         fseek(file_ptr, 0, SEEK_SET);
         if (data_len != 0) {
             read_data = (char *)calloc(data_len, sizeof(char));
@@ -88,10 +93,10 @@ char *read_subdoc_input_param_from_file(char *file_path)
                 fclose(file_ptr);
                 return NULL;
             }
-            if (fread(read_data, data_len, 1, file_ptr) != 0) {
-                printf("%s:%d file read success:%s data len:%d\r\n", __func__, __LINE__, file_path, data_len);
+            if (fread(read_data, data_len, 1, file_ptr) == 1) {
+                printf("%s:%d file read success:%s data len:%ld\r\n", __func__, __LINE__, file_path, data_len);
             } else {
-                printf("%s:%d file read failure:%s data len:%d\r\n", __func__, __LINE__, file_path, data_len);
+                printf("%s:%d file read failure:%s data len:%ld\r\n", __func__, __LINE__, file_path, data_len);
                 fclose(file_ptr);
                 free(read_data);
                 return NULL;

source/sampleapps/wifi_webconfig_consumer.c

@@ -379,7 +379,7 @@ void sig_handler(int sig)
 }
 void cleanup_function()
 {
-    remove(CONSUMER_APP_FILE);
+    (void)remove(CONSUMER_APP_FILE);
 }
 int main (int argc, char *argv[])
 {

source/utils/wifi_validator.c

@@ -905,7 +905,7 @@ int early_validate_interworking(const cJSON *interworking, pErr execRetVal)
     validate_param_bool(interworking, "InterworkingEnable", param);
     validate_param_integer(interworking, "AccessNetworkType", param);
     if (param->valuedouble > 5) {
-        wifi_util_error_print(WIFI_PASSPOINT,"%s:%d: Validation failed for AccessNetworkType=%d\n",
+        wifi_util_error_print(WIFI_PASSPOINT, "%s:%d: Validation failed for AccessNetworkType=%f\n",
             __func__, __LINE__, param->valuedouble);
         strncpy(execRetVal->ErrorMsg, "Invalid Access Network type",sizeof(execRetVal->ErrorMsg)-1);
         return RETURN_ERR;
@@ -2053,7 +2053,7 @@ int validate_radio_vap(const cJSON *wifi, wifi_radio_operationParam_t *wifi_radi
 	// HwMode
 	validate_param_integer(wifi, "HwMode", param);
         if (validate_wifi_hw_variant(wifi_radio_info->band, param->valuedouble) != RETURN_OK) {
-            wifi_util_dbg_print(WIFI_PASSPOINT,"Invalid wifi radio hardware mode [%d] configuration\n", param->valuedouble);
+            wifi_util_dbg_print(WIFI_PASSPOINT, "Invalid wifi radio hardware mode [%f] configuration\n", param->valuedouble);
             strncpy(execRetVal->ErrorMsg, "Invalid wifi radio hardware mode config",sizeof(execRetVal->ErrorMsg)-1);
             return RETURN_ERR;
         }
@@ -2178,25 +2178,27 @@ int validate_radio_vap(const cJSON *wifi, wifi_radio_operationParam_t *wifi_radi
 
         //RadarDetected
         validate_param_string(wifi, "RadarDetected", param);
-        copy_string(wifi_radio_info->radarDetected, param->valuestring );
+        snprintf(wifi_radio_info->radarDetected, sizeof(wifi_radio_info->radarDetected), "%s",
+            param->valuestring ? param->valuestring : "");
 
         // Amsdu_Tid
         validate_param_string(wifi, "Amsdu_Tid", param);
         ptr = param->valuestring;
         tmp = param->valuestring;
 
         uint8_t tid_idx = 0;
+        int tid_val = 0;
         while ((ptr = strchr(tmp, ',')) != NULL) {
             ptr++;
-            wifi_radio_info->amsduTid[tid_idx] = atoi(tmp);
-            if ((wifi_radio_info->amsduTid[tid_idx] != FALSE ||
-                    wifi_radio_info->amsduTid[tid_idx] != TRUE)) {
+            tid_val = atoi(tmp);
+            if (tid_val != FALSE && tid_val != TRUE) {
                 wifi_util_dbg_print(WIFI_PASSPOINT, "Invalid value when parsing AMSDU TID: %d\n",
-                    wifi_radio_info->amsduTid[tid_idx]);
+                    tid_val);
                 strncpy(execRetVal->ErrorMsg, "Invalid AMSDU TID list",
                     sizeof(execRetVal->ErrorMsg) - 1);
                 return RETURN_ERR;
             }
+            wifi_radio_info->amsduTid[tid_idx] = tid_val;
             tmp = ptr;
             tid_idx++;
         }