summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@me.com>2016-03-06 15:04:02 -0700
committerNathan Hjelm <hjelmn@me.com>2016-03-06 15:04:02 -0700
commit0dcc646bb536c293f6e53c802d85c6bdd416867a (patch)
treec8a67cc2f280c2c382aa8fb24c86db87527a17c5
parentdc7760a99f46dc8965aa2b01e34ba9a7019f7837 (diff)
downloadlibusb-0dcc646bb536c293f6e53c802d85c6bdd416867a.tar.gz
core: re-add one more conditional
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--libusb/descriptor.c8
-rw-r--r--libusb/version_nano.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index 14657d1..4c9435f 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -198,9 +198,11 @@ static void clear_interface(struct libusb_interface *usb_interface)
(struct libusb_interface_descriptor *)
usb_interface->altsetting + i;
free((void *) ifp->extra);
- for (j = 0; j < ifp->bNumEndpoints; j++)
- clear_endpoint((struct libusb_endpoint_descriptor *)
- ifp->endpoint + j);
+ if (ifp->endpoint) {
+ for (j = 0; j < ifp->bNumEndpoints; j++)
+ clear_endpoint((struct libusb_endpoint_descriptor *)
+ ifp->endpoint + j);
+ }
free((void *) ifp->endpoint);
}
}
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 21ad375..cb99241 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11101
+#define LIBUSB_NANO 11102