From 80e4775f607ae8eb95dd4779560c9900be2c1115 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 14 Feb 2005 21:56:15 +0000 Subject: [PATCH] 2005-02-14 Dan Williams * src/NetworkManagerDHCP.c - (set_domain_searches): Fix free of invalid pointer git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@452 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/NetworkManagerDHCP.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b14070ea92..fd9d1ac9c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-14 Dan Williams + + * src/NetworkManagerDHCP.c + - (set_domain_searches): Fix free of invalid pointer + 2005-02-14 Dan Williams Patch from Peter Jones: diff --git a/src/NetworkManagerDHCP.c b/src/NetworkManagerDHCP.c index e947848920..6abc1796b2 100644 --- a/src/NetworkManagerDHCP.c +++ b/src/NetworkManagerDHCP.c @@ -85,7 +85,7 @@ static void set_domain_searches (NMDevice *dev, const char *searches_str) { GError *error = NULL; GList *elt; - char **searches; + char **searches, **s; /* Reset our domain search list */ for (elt = dev->app_data->domain_search_ids; elt; elt = elt->next) @@ -103,9 +103,9 @@ static void set_domain_searches (NMDevice *dev, const char *searches_str) searches = g_strsplit (searches_str, " ", 0); - for (; *searches; searches++) + for (s = searches; *s; s++) { - const char *search_elt = *searches; + const char *search_elt = *s; guint id; syslog (LOG_ERR, G_GNUC_PRETTY_FUNCTION ": Adding domain search: %s\n", search_elt);