Skip to content

RDKB-64347: Fixing coverity issues #1065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bharathivelp wants to merge 1 commit into
base: develop
Choose a base branch
from
+54 −109
Open

RDKB-64347: Fixing coverity issues #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/dml/dml_webconfig/dml_onewifi_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,9 +1778,9 @@ void update_dml_vap_defaults() {
if (i<2) {
memset(wps_pin, 0, sizeof(wps_pin));
if (wifi_hal_get_default_wps_pin(wps_pin) == RETURN_OK) {
strcpy(vap_default[i].wps_pin, wps_pin);
snprintf(vap_default[i].wps_pin, sizeof(vap_default[i].wps_pin), "%s", wps_pin);
} else {
strcpy(vap_default[i].wps_pin, INVALID_KEY);
snprintf(vap_default[i].wps_pin, sizeof(vap_default[i].wps_pin), "%s", INVALID_KEY);
}
}
vap_default[i].txoverflow = 0;
Expand Down
8 changes: 7 additions & 1 deletion source/dml/wifi_ssp/ssp_loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,13 @@ void update_macfilter_list(int instance_number, int total_entries, hash_map_t *p
} else {
snprintf(index_instances, sizeof(index_instances), "%d,", l_data_index[l_index]);
}
strcat(index_list, index_instances);
size_t len = strlen(index_list);
size_t remaining = sizeof(index_list) - len;
int result = snprintf(index_list + len, remaining, "%s", index_instances);
if(result < 0 || (size_t)result >= remaining) {
wifi_util_dbg_print(WIFI_PSM, "%s:%d: index_list buffer overflow\n", __func__, __LINE__);
return;
}
}
Comment thread
bharathivelp marked this conversation as resolved.

wifi_util_dbg_print(WIFI_PSM, "%s:%d total mac filter list entry:%s\r\n",__func__, __LINE__, index_list);
Expand Down
115 changes: 27 additions & 88 deletions source/sampleapps/webconfig_consumer_apis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,7 @@ void test_radio_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data = NULL;
Expand Down Expand Up @@ -759,7 +757,7 @@ void test_null_subdoc_change(webconfig_consumer_t *consumer)
}
}

if (ret == webconfig_error_none) {
if (ret == webconfig_error_none && str != NULL) {
printf("%s:%d: webconfig consumer null vap start test\n", __func__, __LINE__);
dump_subdoc(str, webconfig_subdoc_type_null);
cmd_start_time = get_current_time_ms();
Expand All @@ -769,10 +767,7 @@ void test_null_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}

webconfig_data_free(data);
free(data);
data = NULL;
}
Expand Down Expand Up @@ -807,6 +802,7 @@ void test_mesh_sta_subdoc_change(webconfig_consumer_t *consumer)
vap_info = get_wifi_radio_vap_info(&data->u.decoded.radios[0], "mesh_sta");
if (vap_info == NULL) {
printf("%s:%d: vap_info is NULL \n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -815,6 +811,7 @@ void test_mesh_sta_subdoc_change(webconfig_consumer_t *consumer)
vap_info = get_wifi_radio_vap_info(&data->u.decoded.radios[1], "mesh_sta");
if (vap_info == NULL) {
printf("%s:%d: vap_info is NULL \n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -824,10 +821,7 @@ void test_mesh_sta_subdoc_change(webconfig_consumer_t *consumer)

// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
printf("%s:%d: start webconfig_encode\n", __func__, __LINE__);
data->u.decoded.num_radios = consumer->hal_cap.wifi_prop.numRadios;

Expand All @@ -838,7 +832,7 @@ void test_mesh_sta_subdoc_change(webconfig_consumer_t *consumer)
}
}

if (ret == webconfig_error_none) {
if (ret == webconfig_error_none && str != NULL) {
printf("%s:%d: webconfig consumer mesh sta vap start test\n", __func__, __LINE__);
dump_subdoc(str, webconfig_subdoc_type_mesh_sta);
#ifdef WEBCONFIG_TESTS_OVER_QUEUE
Expand All @@ -852,10 +846,7 @@ void test_mesh_sta_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}

webconfig_data_free(data);
free(data);
data = NULL;
}
Expand Down Expand Up @@ -912,6 +903,7 @@ void test_mesh_subdoc_change(webconfig_consumer_t *consumer)
rdk_vap = get_wifi_radio_rdkvap_info(&data->u.decoded.radios[0], "mesh_backhaul");
if ((rdk_vap == NULL)) {
printf("%s:%d: rdk_vap is null\n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -923,6 +915,7 @@ void test_mesh_subdoc_change(webconfig_consumer_t *consumer)
acl_entry = (acl_entry_t *)malloc(sizeof(acl_entry_t));
if (acl_entry == NULL) {
printf("%s:%d NULL Pointer \n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -935,10 +928,7 @@ void test_mesh_subdoc_change(webconfig_consumer_t *consumer)

// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
printf("%s:%d: start webconfig_encode\n", __func__, __LINE__);
data->u.decoded.num_radios = consumer->hal_cap.wifi_prop.numRadios;

Expand All @@ -949,7 +939,7 @@ void test_mesh_subdoc_change(webconfig_consumer_t *consumer)
}
}

if (ret == webconfig_error_none) {
if (ret == webconfig_error_none && str != NULL) {
printf("%s:%d: webconfig consumer mesh vap start test\n", __func__, __LINE__);
dump_subdoc(str, webconfig_subdoc_type_mesh);
#ifdef WEBCONFIG_TESTS_OVER_QUEUE
Expand All @@ -963,10 +953,7 @@ void test_mesh_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}

webconfig_data_free(data);
free(data);
data = NULL;
}
Expand Down Expand Up @@ -1014,6 +1001,7 @@ void test_macfilter_subdoc_change(webconfig_consumer_t *consumer)

if ((rdk_vap == NULL)) {
printf("%s:%d: rdk_vap is null\n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -1025,6 +1013,7 @@ void test_macfilter_subdoc_change(webconfig_consumer_t *consumer)
acl_entry = (acl_entry_t *)malloc(sizeof(acl_entry_t));
if (acl_entry == NULL) {
printf("%s:%d NULL Pointer \n", __func__, __LINE__);
webconfig_data_free(data);
free(data);
data = NULL;
return;
Expand All @@ -1037,10 +1026,7 @@ void test_macfilter_subdoc_change(webconfig_consumer_t *consumer)

// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
printf("%s:%d: start webconfig_encode\n", __func__, __LINE__);
data->u.decoded.num_radios = consumer->hal_cap.wifi_prop.numRadios;

Expand All @@ -1051,7 +1037,7 @@ void test_macfilter_subdoc_change(webconfig_consumer_t *consumer)
}
}

if (ret == webconfig_error_none) {
if (ret == webconfig_error_none && str != NULL) {
printf("%s:%d: webconfig consumer macfilter start test\n", __func__, __LINE__);
dump_subdoc(str, webconfig_subdoc_type_mac_filter);
#ifdef WEBCONFIG_TESTS_OVER_QUEUE
Expand All @@ -1065,9 +1051,7 @@ void test_macfilter_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data = NULL;
Expand All @@ -1094,12 +1078,6 @@ void test_vif_neighbors_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: command start current time:%llu\n", __func__, __LINE__, cmd_start_time);
rbus_setStr(consumer->rbus_handle, WIFI_WEBCONFIG_DOC_DATA_SOUTH, str);
#endif
} else {
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
}

Expand All @@ -1126,12 +1104,6 @@ void test_steeringclient_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: command start current time:%llu\n", __func__, __LINE__, cmd_start_time);
rbus_setStr(consumer->rbus_handle, WIFI_WEBCONFIG_DOC_DATA_SOUTH, str);
#endif
} else {
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
}

Expand All @@ -1157,12 +1129,6 @@ void test_steerconfig_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: command start current time:%llu\n", __func__, __LINE__, cmd_start_time);
rbus_setStr(consumer->rbus_handle, WIFI_WEBCONFIG_DOC_DATA_SOUTH, str);
#endif
} else {
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
}

Expand All @@ -1186,12 +1152,6 @@ void test_statsconfig_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: command start current time:%llu\n", __func__, __LINE__, cmd_start_time);
rbus_setStr(consumer->rbus_handle, WIFI_WEBCONFIG_DOC_DATA_SOUTH, str);
#endif
} else {
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
}

Expand Down Expand Up @@ -1237,18 +1197,15 @@ void test_private_subdoc_change(webconfig_consumer_t *consumer)

// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
printf("%s:%d start webconfig_encode num_of_radio:%d\n", __func__, __LINE__, data->u.decoded.num_radios);
ret = webconfig_encode(&consumer->webconfig, data,
webconfig_subdoc_type_private);
if (ret == webconfig_error_none)
str = data->u.encoded.raw;
}

if (ret == webconfig_error_none) {
if (ret == webconfig_error_none && str != NULL) {
printf("%s:%d: webconfig consumer private vap start test\n", __func__, __LINE__);
dump_subdoc(str, webconfig_subdoc_type_private);
#ifdef WEBCONFIG_TESTS_OVER_QUEUE
Expand All @@ -1262,9 +1219,7 @@ void test_private_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data = NULL;
Expand Down Expand Up @@ -1325,10 +1280,7 @@ void test_home_subdoc_change(webconfig_consumer_t *consumer)

// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
printf("%s:%d: start webconfig_encode\n", __func__, __LINE__);
ret = webconfig_encode(&consumer->webconfig, data,
webconfig_subdoc_type_home);
Expand All @@ -1351,9 +1303,7 @@ void test_home_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data=NULL;
Expand Down Expand Up @@ -1442,10 +1392,7 @@ void test_lnf_subdoc_change(webconfig_consumer_t *consumer)
}
// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
data->u.decoded.num_radios = consumer->hal_cap.wifi_prop.numRadios;

printf("%s:%d: start webconfig_encode \n", __func__, __LINE__);
Expand All @@ -1469,10 +1416,7 @@ void test_lnf_subdoc_change(webconfig_consumer_t *consumer)
} else {
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data = NULL;
Expand Down Expand Up @@ -1534,10 +1478,7 @@ void test_xfinity_subdoc_change(webconfig_consumer_t *consumer)
}
// clearing the descriptor and raw json data
data->descriptor = 0;
if (data->u.encoded.raw != NULL) {
free(data->u.encoded.raw);
data->u.encoded.raw = NULL;
}
webconfig_data_free(data);
data->u.decoded.num_radios = consumer->hal_cap.wifi_prop.numRadios;

printf("%s:%d: start webconfig_encode \n", __func__, __LINE__);
Expand All @@ -1562,9 +1503,7 @@ void test_xfinity_subdoc_change(webconfig_consumer_t *consumer)
printf("%s:%d: Webconfig set failed\n", __func__, __LINE__);
}

if (str != NULL) {
free(str);
}
webconfig_data_free(data);

free(data);
data = NULL;
Expand Down
Loading
Loading