From 176ffe5c52aaf29b92cd40970c9d42ed721bc9fd Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Thu, 12 Jun 2014 12:22:51 +0000
Subject: [PATCH] added checks to prevent calling libusb functions after
 libusb_close() was called

---
 src/hci_transport_usb.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/hci_transport_usb.c b/src/hci_transport_usb.c
index a12cd3a21..dc0d46849 100644
--- a/src/hci_transport_usb.c
+++ b/src/hci_transport_usb.c
@@ -303,6 +303,8 @@ static void handle_completed_transfer(struct libusb_transfer *transfer){
         log_info("usb_process_ds endpoint unknown %x", transfer->endpoint);
     }
 
+    if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return;
+
     if (resubmit){
         // Re-submit transfer 
         transfer->user_data = NULL;
@@ -333,7 +335,10 @@ static int usb_process_ds(struct data_source *ds) {
         void * next = handle_packet->user_data;
 
         handle_completed_transfer(handle_packet);
-        
+
+        // handle case where libusb_close might be called by hci packet handler        
+        if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return -1;
+
         // Move to next in the list of packets to handle
         if (next) {
             handle_packet = (struct libusb_transfer*)next;
@@ -591,6 +596,10 @@ static int usb_close(void *transport_config){
         case LIB_USB_OPENED:
             libusb_exit(NULL);
     }
+
+    libusb_state = LIB_USB_CLOSED;
+    handle = NULL;
+
     return 0;
 }