From: Gerhard Sittig <redacted>
Date: Wed, 12 Jun 2019 21:58:24 +0000 (+0200)
Subject: ftdi-la: do enter the error path upon VID:PID mismatch
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=01ae826ba3c694eff0cf83cadbc43a98550f94e0

ftdi-la: do enter the error path upon VID:PID mismatch

Bug #1390 reports that "!desc" is always true (should be: false?). But
the actual problem would be that 'desc' is _not_ NULL when none of the
supported chips' VID:PID matched (FT232H happens to "get found" then,
erroneously).

Add a sentinel to the table of supported chips, such that 'desc' becomes
NULL upon mismatch, and the error path is entered.
---

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index cee2f032..81d7cc8a 100644
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -81,6 +81,7 @@ static const struct ftdi_chip_desc *chip_descs[] = {
 	&ft2232h_desc,
 	&ft232r_desc,
 	&ft232h_desc,
+	NULL,
 };
 
 static void scan_device(struct ftdi_context *ftdic,
@@ -98,6 +99,8 @@ static void scan_device(struct ftdi_context *ftdic,
 	desc = NULL;
 	for (unsigned long i = 0; i < ARRAY_SIZE(chip_descs); i++) {
 		desc = chip_descs[i];
+		if (!desc)
+			break;
 		if (desc->vendor == usb_desc.idVendor &&
 			desc->product == usb_desc.idProduct)
 			break;