colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifnet: do not call g_strv_length() on NULL

Browse Source
This commit is contained in:
Jiří Klimeš
2012-04-12 13:26:22 +02:00
parent 5f4d238baa
commit 21bc3ab517
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings/plugins/ifnet/net_utils.c
View File

@@ -404,7 +404,7 @@ has_ip6_address (const char *conn_name)
g_return_val_if_fail (conn_name != NULL, FALSE); g_return_val_if_fail (conn_name != NULL, FALSE);
ipset = split_addresses (ifnet_get_data (conn_name, "config")); ipset = split_addresses (ifnet_get_data (conn_name, "config"));
length = g_strv_length (ipset); length = ipset ? g_strv_length (ipset) : 0;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
if (!is_ip6_address (ipset[i])) if (!is_ip6_address (ipset[i]))
continue; continue;
@@ -618,7 +618,7 @@ convert_ip4_config_block (const char *conn_name)
g_return_val_if_fail (conn_name != NULL, NULL); g_return_val_if_fail (conn_name != NULL, NULL);
ipset = split_addresses (ifnet_get_data (conn_name, "config")); ipset = split_addresses (ifnet_get_data (conn_name, "config"));
length = g_strv_length (ipset); length = ipset ? g_strv_length (ipset) : 0;
routes = ifnet_get_data (conn_name, "routes"); routes = ifnet_get_data (conn_name, "routes");
if (routes) if (routes)
@@ -654,7 +654,7 @@ convert_ip6_config_block (const char *conn_name)
g_return_val_if_fail (conn_name != NULL, NULL); g_return_val_if_fail (conn_name != NULL, NULL);
ipset = split_addresses (ifnet_get_data (conn_name, "config")); ipset = split_addresses (ifnet_get_data (conn_name, "config"));
length = g_strv_length (ipset); length = ipset ? g_strv_length (ipset) : 0;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
ip = ipset[i]; ip = ipset[i];
ip = strip_string (ip, '"'); ip = strip_string (ip, '"');
@@ -684,7 +684,7 @@ convert_ip4_routes_block (const char *conn_name)
g_return_val_if_fail (conn_name != NULL, NULL); g_return_val_if_fail (conn_name != NULL, NULL);
ipset = split_routes (ifnet_get_data (conn_name, "routes")); ipset = split_routes (ifnet_get_data (conn_name, "routes"));
length = g_strv_length (ipset); length = ipset ? g_strv_length (ipset) : 0;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
ip = ipset[i]; ip = ipset[i];
if (find_default_gateway_str (ip) || strstr (ip, "::") if (find_default_gateway_str (ip) || strstr (ip, "::")
@@ -718,7 +718,7 @@ convert_ip6_routes_block (const char *conn_name)
g_return_val_if_fail (conn_name != NULL, NULL); g_return_val_if_fail (conn_name != NULL, NULL);
ipset = split_routes (ifnet_get_data (conn_name, "routes")); ipset = split_routes (ifnet_get_data (conn_name, "routes"));
length = g_strv_length (ipset); length = ipset ? g_strv_length (ipset) : 0;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
ip = ipset[i]; ip = ipset[i];
ip = strip_string (ip, '"'); ip = strip_string (ip, '"');