pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-02-04 21:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spice_usb_device_manager_add_dev: check auto_ok before freeing libusb device list

Browse Source 
In preparation for a different SpiceUsbDevice.
This commit is contained in:
Uri Lublin 2012-07-08 12:04:26 +03:00
parent 2339c0005c
commit a0ec25a170
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/usb-device-manager.c
View File

@ -543,6 +543,7 @@ static void spice_usb_device_manager_add_dev(SpiceUsbDeviceManager *self,
libusb_device *device = NULL, **dev_list = NULL;
const gchar *devtype, *devclass;
int i, bus, address;
gboolean auto_ok = FALSE;
devtype = g_udev_device_get_property(udev, "DEVTYPE");
/* Check if this is a usb device (and not an interface) */
@ -572,6 +573,13 @@ static void spice_usb_device_manager_add_dev(SpiceUsbDeviceManager *self,
}
}
if (device && priv->auto_connect) {
auto_ok = usbredirhost_check_device_filter(
priv->auto_conn_filter_rules,
priv->auto_conn_filter_rules_count,
device, 0) == 0;
}
if (!priv->coldplug_list)
libusb_free_device_list(dev_list, 1);
@ -584,16 +592,11 @@ static void spice_usb_device_manager_add_dev(SpiceUsbDeviceManager *self,
g_ptr_array_add(priv->devices, device);
if (priv->auto_connect) {
gboolean can_redirect, auto_ok;
gboolean can_redirect;
can_redirect = spice_usb_device_manager_can_redirect_device(
self, (SpiceUsbDevice *)device, NULL);
auto_ok = usbredirhost_check_device_filter(
priv->auto_conn_filter_rules,
priv->auto_conn_filter_rules_count,
device, 0) == 0;
if (can_redirect && auto_ok)
spice_usb_device_manager_connect_device_async(self,
(SpiceUsbDevice *)device, NULL,