From 36d76382a06d00c936e881acb60c69cbb91d679f Mon Sep 17 00:00:00 2001
From: Pete Batard <pbatard@gmail.com>
Date: Wed, 10 Feb 2010 00:51:54 +0000
Subject: fixed memory leak dues to HID collections in set_composite_device

---
 libusb/os/windows_usb.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 176c5db..425dc1a 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -1135,13 +1135,22 @@ enum libusb_hid_report_type {
 		for (j=0; j<nb_paths; j++) {
 			if ( (safe_strncmp(sanitized_path[j], sanitized_short, strlen(sanitized_short)) == 0)
 			  || (safe_strcmp(hid_path[j], sanitized_short) == 0 ) ) {
-				priv->usb_interface[interface_number].path = sanitized_path[j];
-				priv->usb_interface[interface_number].apib = &usb_api_backend[api_type[j]];
-				if ((api_type[j] == USB_API_HID) && (priv->hid == NULL)) {
-						priv->hid = calloc(1, sizeof(struct hid_device_priv));
+				// HID devices can have multiple collections (COL##) for each MI_## interface
+				if (priv->usb_interface[interface_number].path != NULL) {
+					usbi_dbg("interface_path[%d] already set - ignoring HID collection: %s", 
+						interface_number, sanitized_path[j]);
+					if (api_type[j] != USB_API_HID) {
+						usbi_warn(ctx, "program assertion failed - not an HID collection");
+					}
+				} else {
+					priv->usb_interface[interface_number].path = sanitized_path[j];
+					priv->usb_interface[interface_number].apib = &usb_api_backend[api_type[j]];
+					if ((api_type[j] == USB_API_HID) && (priv->hid == NULL)) {
+							priv->hid = calloc(1, sizeof(struct hid_device_priv));
+					}
+					priv->composite_api_flags |= 1<<api_type[j];
+					sanitized_path[j] = NULL;
 				}
-				priv->composite_api_flags |= 1<<api_type[j];
-				sanitized_path[j] = NULL;
 			}
 		}
 		safe_free(sanitized_short);
-- 
cgit v1.2.1