fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-07 11:00:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: fix double-free of error when handling D-Bus scan request

Browse source 
The error passed into the function by the manager's auth request
logic should not be freed.
This commit is contained in:
Dan Williams 2014-01-23 17:26:12 -06:00
parent d965348485
commit e5045345df
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/devices/nm-device-wifi.c
View file

@ -1389,21 +1389,25 @@ request_scan_cb (NMDevice *device,
gpointer user_data)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (device);
GError *local = NULL;
if (error) {
dbus_g_method_return_error (context, error);
g_clear_error (&error);
} else if (!check_scanning_allowed (self)) {
error = g_error_new_literal (NM_WIFI_ERROR,
return;
}
if (!check_scanning_allowed (self)) {
local = g_error_new_literal (NM_WIFI_ERROR,
NM_WIFI_ERROR_SCAN_NOT_ALLOWED,
"Scanning not allowed at this time");
dbus_g_method_return_error (context, error);
g_error_free (error);
} else {
cancel_pending_scan (self);
request_wireless_scan (self);
dbus_g_method_return (context);
dbus_g_method_return_error (context, local);
g_error_free (local);
return;
}
cancel_pending_scan (self);
request_wireless_scan (self);
dbus_g_method_return (context);
}
static void