Changeset cfce4d127184f4e4f334976151a0f80594bb5e22 in libusb

Timestamp:

02/15/10 21:10:08 (7 months ago)

Author:

Daniel Drake <dan@…>

Children:

68af9f8d731f700267335941a8214d34ab518cc8

Parents:

161893cfbefefe315f657677705abe090fc526f2

git-author:

Nathan Hjelm <hjelmn@mac.com> / 2010-02-15T14:10:08Z-0600

git-committer:

Daniel Drake <dan@reactivated.net> / 2010-02-15T14:10:08Z-0600

Message:

Darwin: fix memory leak in process_device

Credit to Mike Colagrosso for finding this bug.

File:

• libusb/os/darwin_usb.c (modified) (5 diffs)

libusb/os/darwin_usb.c

@@ -442 +442 @@
   UInt8                 bDeviceClass, bDeviceSubClass;
   IOUSBDevRequest      req;
-  int ret;
+  int ret, need_unref = 0;
 
   dev = usbi_get_device_by_session_id(ctx, locationID);
   if (!dev) {
-    _usbi_log (ctx, LOG_LEVEL_INFO, "allocating new device for location 0x%08x", locationID);
+    usbi_info (ctx, "allocating new device for location 0x%08x", locationID);
     dev = usbi_alloc_device(ctx, locationID);
+    need_unref = 1;
     if (!dev)
       return LIBUSB_ERROR_NO_MEM;
@@ -498 +499 @@
 
     if (ret != kIOReturnSuccess) {
-      _usbi_log (ctx, LOG_LEVEL_WARNING, "could not retrieve device descriptor: %s. skipping device", darwin_error_str (ret));
-      libusb_unref_device(dev);
+      usbi_warn (ctx, "could not retrieve device descriptor: %s. skipping device", darwin_error_str (ret));
+      if (need_unref)
+        libusb_unref_device(dev);
       return -1;
     }
@@ -523 +525 @@
 
     if (ret < 0) {
-      libusb_unref_device(dev);
+      if (need_unref)
+        libusb_unref_device(dev);
       return -1;
     }
@@ -529 +532 @@
     priv = (struct darwin_device_priv *)dev->os_priv;
 
-    _usbi_log (ctx, LOG_LEVEL_INFO, "using existing device for location 0x%08x", locationID);
+    usbi_info (ctx, "using existing device for location 0x%08x", locationID);
   }
 
@@ -539 +542 @@
   *_discdevs = discdevs;
   
-  _usbi_log (ctx, LOG_LEVEL_INFO, "found device with address %d at %s", dev->device_address, priv->sys_path);
-  
+  usbi_info (ctx, "found device with address %d at %s", dev->device_address, priv->sys_path);
+  
+  if (need_unref)
+    libusb_unref_device(dev);
+
   return 0;
 }