diff options
| author | NIIBE Yutaka <[email protected]> | 2016-04-27 15:08:08 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-04-27 15:08:08 +0000 |
| commit | 508b0deb70d39d388149be9a63fab24cc956a239 (patch) | |
| tree | 188dcf66165e18fbb365f1aae2d45f96f5749fcb | |
| parent | gpg: Add experimental AKL method "wkd" and option --with-wkd-hash. (diff) | |
| download | gnupg-508b0deb70d39d388149be9a63fab24cc956a239.tar.gz gnupg-508b0deb70d39d388149be9a63fab24cc956a239.zip | |
scd: Fix memory leaks.
* 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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | scd/ccid-driver.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index e968b83a7..601681fab 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -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++) { |