security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

scd: Fix memory leaks.

Browse Source 
* scd/ccid-driver.c (scan_or_find_usb_device): Return on
LIBUSB_ERROR_NO_MEM.  Free CONFIG before return except on error.
(scan_or_find_devices): Free device list.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-04-28 00:08:08 +09:00
parent 87de9e19ed
commit 508b0deb70
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scd/ccid-driver.c
View File

@ -1149,7 +1149,8 @@ scan_or_find_usb_device (int scan_mode,
err = libusb_get_config_descriptor (dev, cfg_no, &config);
if (err < 0)
{
libusb_free_config_descriptor (config);
if (err == LIBUSB_ERROR_NO_MEM)
return err;
continue;
}
@ -1232,6 +1233,7 @@ scan_or_find_usb_device (int scan_mode,
{
libusb_close (idev);
free (rid);
libusb_free_config_descriptor (config);
return 1; /* Out of core. */
}
memcpy (*ifcdesc_extra, ifcdesc->extra,
@ -1258,6 +1260,7 @@ scan_or_find_usb_device (int scan_mode,
free (rid);
*r_idev = idev;
libusb_free_config_descriptor (config);
return 1; /* Found requested device. */
}
else
@ -1273,10 +1276,13 @@ scan_or_find_usb_device (int scan_mode,
libusb_close (idev);
idev = NULL;
libusb_free_config_descriptor (config);
return 0;
}
}
}
libusb_free_config_descriptor (config);
}
return 0;
@ -1376,6 +1382,7 @@ scan_or_find_devices (int readerno, const char *readerid,
interface_number,
ep_bulk_out, ep_bulk_in, ep_intr))
{
libusb_free_device_list (dev_list, 1);
/* Found requested device or out of core. */
if (!idev)
{
@ -1389,6 +1396,8 @@ scan_or_find_devices (int readerno, const char *readerid,
}
}
libusb_free_device_list (dev_list, 1);
/* Now check whether there are any devices with special transport types. */
for (i=0; transports[i].name; i++)
{