security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

* ccid-driver.c (read_device_info): Fix segfault when usb device is not

Browse Source 
accessible. (ccid_open_reader): Allow working with an even older version
of libusb (usb_busses global instead of usb_get_busses()).
This commit is contained in:
David Shaw 2004-09-11 02:29:36 +00:00
parent f9a057a941
commit 0f48ec7bba
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2004-09-10 David Shaw <dshaw@jabberwocky.com>
* ccid-driver.c (read_device_info): Fix segfault when usb device
is not accessible.
(ccid_open_reader): Allow working with an even older version of
libusb (usb_busses global instead of usb_get_busses()).
2004-09-09 Werner Koch <wk@g10code.com> 2004-09-09 Werner Koch <wk@g10code.com>
* cardglue.h: Add members for CA fingerprints. * cardglue.h: Add members for CA fingerprints.

8
g10/ccid-driver.c
View File

@ -423,6 +423,9 @@ read_device_info (ccid_driver_t handle, struct usb_device *dev)
struct usb_config_descriptor *config = dev->config + cfg_no; struct usb_config_descriptor *config = dev->config + cfg_no;
int ifc_no; int ifc_no;
if(!config)
continue;
for (ifc_no=0; ifc_no < config->bNumInterfaces; ifc_no++) for (ifc_no=0; ifc_no < config->bNumInterfaces; ifc_no++)
{ {
struct usb_interface *interface = config->interface + ifc_no; struct usb_interface *interface = config->interface + ifc_no;
@ -564,7 +567,12 @@ ccid_open_reader (ccid_driver_t *handle, int readerno)
usb_find_busses(); usb_find_busses();
usb_find_devices(); usb_find_devices();
#ifdef HAVE_USB_GET_BUSSES
busses = usb_get_busses(); busses = usb_get_busses();
#else
busses = usb_busses;
#endif
for (bus = busses; bus; bus = bus->next) for (bus = busses; bus; bus = bus->next)
{ {