descriptor.c: AlternateSettings are related by InterfaceNumber

A block of AlternateSettings for a certain InterfaceNumber does not necessarily
start with AlternateSetting 0, so check Interface Descriptors belong to
each other by using InterfaceNumber, as specified in the spec.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index ea4ad39f17315c33c2c0e8eddd9d265c406ce9dc..b53df77c57757dfc7ff8b4a22c7e7dfdb9bfbb25 100644 (file)
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -199,6 +199,7 @@ static int parse_interface(libusb_context *ctx,
        int len;
        int r;
        int parsed = 0;
+       int interface_number = -1;
        size_t tmp;
        struct usb_descriptor_header header;
        struct libusb_interface_descriptor *ifp;
@@ -247,6 +248,9 @@ static int parse_interface(libusb_context *ctx,
                ifp->extra_length = 0;
                ifp->endpoint = NULL;
 
+               if (interface_number == -1)
+                       interface_number = ifp->bInterfaceNumber;
+
                /* Skip over the interface */
                buffer += ifp->bLength;
                parsed += ifp->bLength;
@@ -326,7 +330,7 @@ static int parse_interface(libusb_context *ctx,
                ifp = (struct libusb_interface_descriptor *) buffer;
                if (size < LIBUSB_DT_INTERFACE_SIZE ||
                                ifp->bDescriptorType != LIBUSB_DT_INTERFACE ||
-                               !ifp->bAlternateSetting)
+                               ifp->bInterfaceNumber != interface_number)
                        return parsed;
        }
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ea3dee43228678140e2163654b0024f6c69f619e..27ee56f8d765bd0d935e3c2bdda21b3283f63717 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10720
+#define LIBUSB_NANO 10721