From fc9962027f2c4f22f2c5e7853d737ef89aa5b6a3 Mon Sep 17 00:00:00 2001 From: Chris Dickens Date: Thu, 11 May 2017 21:33:04 -0700 Subject: [PATCH] Windows: Fix regression introduced by 05b0b55b Closes #298, Closes #300 Signed-off-by: Chris Dickens --- libusb/os/windows_winusb.h | 6 ++++-- libusb/version_nano.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h index 1c8ee34..b7b9cd9 100644 --- a/libusb/os/windows_winusb.h +++ b/libusb/os/windows_winusb.h @@ -244,8 +244,10 @@ static inline void windows_device_priv_release(struct libusb_device *dev) int i; free(p->path); - for (i = 0; i < dev->num_configurations; i++) - free(p->config_descriptor[i]); + if ((dev->num_configurations > 0) && (p->config_descriptor != NULL)) { + for (i = 0; i < dev->num_configurations; i++) + free(p->config_descriptor[i]); + } free(p->config_descriptor); free(p->hid); for (i = 0; i < USB_MAXINTERFACES; i++) { diff --git a/libusb/version_nano.h b/libusb/version_nano.h index e9614aa..33169bc 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11197 +#define LIBUSB_NANO 11198 -- 2.7.4