From 6130a4f6b87589ee07272a2900f54aa040a374ce Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 12 Feb 2008 20:21:36 +0000 Subject: [PATCH] 2008-02-12 Dan Williams * libnm-util/nm-utils.c - (nm_utils_convert_uint_array_to_string): don't die on NULL array, it's just any empty array git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3310 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ libnm-util/nm-utils.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e95c227277..1d261e7ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-12 Dan Williams + + * libnm-util/nm-utils.c + - (nm_utils_convert_uint_array_to_string): don't die on NULL array, it's + just any empty array + 2008-02-12 Dan Williams * system-settings/src/nm-system-config-interface.c diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index fc28fb9def..442ed0ce96 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -489,7 +489,7 @@ nm_utils_convert_uint_array_to_string (const GValue *src_value, GValue *dest_val array = (GArray *) g_value_get_boxed (src_value); printable = g_string_new ("["); - while (i < array->len) { + while (array && (i < array->len)) { char buf[INET_ADDRSTRLEN + 1]; struct in_addr addr;