summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2005-03-31 16:13:06 +0000
committerDan Williams <dcbw@redhat.com>2005-03-31 16:13:06 +0000
commit4c4be4c15e94539556fc314f4976f8b68a87577f (patch)
tree9053dddcbf70a3a400ae868ffc3b3b7336418649
parent66039f43b381e421998160171660367f8b842f1f (diff)
downloadNetworkManager-4c4be4c15e94539556fc314f4976f8b68a87577f.tar.gz
2005-03-31 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.c - (nm_device_wireless_scan): Fix leak of scan results in some instances git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@532 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--ChangeLog6
-rw-r--r--src/NetworkManagerDevice.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ad408a712..954aa12ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-31 Dan Williams <dcbw@redhat.com>
+
+ * src/NetworkManagerDevice.c
+ - (nm_device_wireless_scan): Fix leak of scan results in some
+ instances
+
2005-03-29 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index f2b1147938..61ecdb76cf 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3766,6 +3766,12 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
}
close (sk);
+
+ if (!scan_results->scan_head.result)
+ {
+ g_free (scan_results);
+ scan_results = NULL;
+ }
}
nm_unlock_mutex (dev->options.wireless.scan_mutex, __FUNCTION__);
}