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

libnm-util: fix array transforms when arrays are NULL

Browse Source
This commit is contained in:
Dan Williams
2009-03-27 14:06:23 -04:00
parent 0ee2250583
commit f3f1ee18d4
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnm-util/nm-utils.c
View File

@@ -566,7 +566,7 @@ nm_utils_convert_strv_to_slist (const GValue *src_value, GValue *dest_value)
str = (char **) g_value_get_boxed (src_value); str = (char **) g_value_get_boxed (src_value);
while (str[i]) while (str && str[i])
list = g_slist_prepend (list, g_strdup (str[i++])); list = g_slist_prepend (list, g_strdup (str[i++]));
g_value_take_boxed (dest_value, g_slist_reverse (list)); g_value_take_boxed (dest_value, g_slist_reverse (list));
@@ -642,7 +642,7 @@ nm_utils_convert_ip4_addr_struct_array_to_string (const GValue *src_value, GValu
ptr_array = (GPtrArray *) g_value_get_boxed (src_value); ptr_array = (GPtrArray *) g_value_get_boxed (src_value);
printable = g_string_new ("["); printable = g_string_new ("[");
while (i < ptr_array->len) { while (ptr_array && (i < ptr_array->len)) {
GArray *array; GArray *array;
char buf[INET_ADDRSTRLEN + 1]; char buf[INET_ADDRSTRLEN + 1];
struct in_addr addr; struct in_addr addr;
@@ -755,7 +755,8 @@ nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_val
array = (GArray *) g_value_get_boxed (src_value); array = (GArray *) g_value_get_boxed (src_value);
printable = g_string_new ("["); printable = g_string_new ("[");
while (array && (i < MIN (array->len, 35))) { if (array) {
while (i < MIN (array->len, 35)) {
if (i > 0) if (i > 0)
g_string_append_c (printable, ' '); g_string_append_c (printable, ' ');
g_string_append_printf (printable, "0x%02X", g_string_append_printf (printable, "0x%02X",
@@ -763,6 +764,7 @@ nm_utils_convert_byte_array_to_string (const GValue *src_value, GValue *dest_val
} }
if (i < array->len) if (i < array->len)
g_string_append (printable, " ... "); g_string_append (printable, " ... ");
}
g_string_append_c (printable, ']'); g_string_append_c (printable, ']');
g_value_take_string (dest_value, printable->str); g_value_take_string (dest_value, printable->str);