Applies to both branches
--
Uwe Bonnes bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
>From b4a1b38ed534943401477d2ab6c3266e6defb355 Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue, 1 Feb 2011 11:02:24 +0100
Subject: Check ftdi pointer before accessing it
---
src/ftdi.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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");
--
1.7.1
--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
