From 5106f2451ca0da9ec2dcd3e623339af673374c74 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 30 Aug 2007 03:15:52 +0000 Subject: [PATCH] Don't segfault on NULL settings values git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2749 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- libnm-util/nm-connection.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 3fdfcb0c05..bcb63daed8 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -189,6 +189,8 @@ garray_to_string (GArray *array) int i; char c; + g_return_val_if_fail (array != NULL, NULL); + str = g_string_sized_new (array->len); for (i = 0; i < array->len; i++) { c = array->data[i]; @@ -283,7 +285,7 @@ dump_setting_member (gpointer key, gpointer value, gpointer user_data) char *val_as_str; val_as_str = gvalue_to_string ((GValue *) value); - g_message ("\t%s : '%s'", (char *) key, val_as_str); + g_message ("\t%s : '%s'", (char *) key, val_as_str ? val_as_str : "(null)"); g_free (val_as_str); }