From 660e8fdab2e3fb90c2189c7dc3501e28cf432b9d Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 24 Jan 2006 20:29:10 +0000 Subject: [PATCH] 2006-01-23 Robert Love * src/dhcp-manager/nm-dhcp-manager.c: Null-out the original byte array before we g_strdup(), not the ultimate string. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1386 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/dhcp-manager/nm-dhcp-manager.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a59f8a45d4..700151172a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-23 Robert Love + + * src/dhcp-manager/nm-dhcp-manager.c: Null-out the original byte array + before we g_strdup(), not the ultimate string. + 2006-01-23 Dan Williams * src/NetworkManagerAP.[ch] diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 2a990afe9c..467ce7de9a 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -444,8 +444,8 @@ static gboolean get_ip4_string (NMDHCPManager *manager, NMDevice *dev, const cha dbus_error_init (&error); if (dbus_message_get_args (reply, &error, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &byte_array, &len, DBUS_TYPE_INVALID)) { + byte_array[len] = '\0'; *string = g_strdup (byte_array); - *string[len] = '\0'; success = TRUE; } }