diff --git a/ChangeLog b/ChangeLog
index a59f8a45d4..700151172a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23  Robert Love  <rml@novell.com>
+
+	* 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  <dcbw@redhat.com>
 
 	* 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;
 				}
 			}