From: Uwe Bonnes Date: Tue, 1 Feb 2011 10:02:24 +0000 (+0100) Subject: Check ftdi pointer before accessing it X-Git-Tag: v1.0rc1~133^2~2 X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=6ab07768470d23ded51bbfd6e5e181b11cd70cd3 Check ftdi pointer before accessing it --- diff --git a/src/ftdi.c b/src/ftdi.c index 6de60be..f2853d3 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -643,12 +643,12 @@ int ftdi_usb_open_desc_index(struct ftdi_context *ftdi, int vendor, int product, char string[256]; int i = 0; - if (libusb_init(&ftdi->usb_ctx) < 0) - ftdi_error_return(-11, "libusb_init() failed"); - if (ftdi == NULL) ftdi_error_return(-11, "ftdi context invalid"); + if (libusb_init(&ftdi->usb_ctx) < 0) + ftdi_error_return(-11, "libusb_init() failed"); + if (libusb_get_device_list(ftdi->usb_ctx, &devs) < 0) ftdi_error_return(-12, "libusb_get_device_list() failed");