depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lib: Fix memory leak patch in device discovery

Browse source 
libusb_free_device_list() needs to be called on the list of USB devices
obtained through libusb_get_device_list() or the list and its elements
will be leaked.

https://bugs.freedesktop.org/show_bug.cgi?id=105427
This commit is contained in:
Mark Harfouche 2018-03-10 18:14:42 +00:00 committed by Bastien Nocera
parent d35da0ce99
commit 58ba9b02ed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libfprint/core.c
View file

@ -561,9 +561,13 @@ API_EXPORTED struct fp_dscv_dev **fp_discover_devs(void)
struct fp_dscv_dev *ddev = discover_dev(udev); struct fp_dscv_dev *ddev = discover_dev(udev);
if (!ddev) if (!ddev)
continue; continue;
/* discover_dev() doesn't hold a reference to the udev,
* so increase the reference for ddev to hold this ref */
libusb_ref_device(udev);
tmplist = g_slist_prepend(tmplist, (gpointer) ddev); tmplist = g_slist_prepend(tmplist, (gpointer) ddev);
dscv_count++; dscv_count++;
} }
libusb_free_device_list(devs, 1);
/* Convert our temporary GSList into a standard NULL-terminated pointer /* Convert our temporary GSList into a standard NULL-terminated pointer
* array. */ * array. */
@ -594,8 +598,10 @@ API_EXPORTED void fp_dscv_devs_free(struct fp_dscv_dev **devs)
if (!devs) if (!devs)
return; return;
for (i = 0; devs[i]; i++) for (i = 0; devs[i]; i++) {
libusb_unref_device(devs[i]->udev);
g_free(devs[i]); g_free(devs[i]);
}
g_free(devs); g_free(devs);
} }