commit 0d07d39d288c72edc84ab15b0fde85c29cbc80ca
author Josh Gao <jmgao@google.com> Tue Sep 27 20:56:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 27 20:56:58 2016 +0000
tree d8ac4f5fc51f48508cd878da195783eef0c100cd
parent 6e8d9356f0aac0d137930ee31bddb3766fa97296
parent 986685536e9f31de492fb20e90234bc7f198ead2

Merge "adb: fix IOKit handle leaks on OS X." am: a2aff3f809 am: 279a1ea5b0 am: dbb34a87b4
am: a539d4c04c

Change-Id: I3622494f5ba6d9a6da8f4879a9390e45323e2ead

adb/usb_osx.cpp

diff --git a/adb/usb_osx.cpp b/adb/usb_osx.cpp
index ddde454..adcbb3e 100644
--- a/adb/usb_osx.cpp
+++ b/adb/usb_osx.cpp
@@ -177,6 +177,7 @@
         kr = (*iface)->GetDevice(iface, &usbDevice);
         if (kIOReturnSuccess != kr || !usbDevice) {
             LOG(ERROR) << "Couldn't grab device from interface (" << std::hex << kr << ")";
+            (*iface)->Release(iface);
             continue;
         }
 
@@ -191,6 +192,7 @@
         (void)IOObjectRelease(usbDevice);
         if ((kIOReturnSuccess != kr) || (!plugInInterface)) {
             LOG(ERROR) << "Unable to create a device plug-in (" << std::hex << kr << ")";
+            (*iface)->Release(iface);
             continue;
         }
 
@@ -200,6 +202,7 @@
         (*plugInInterface)->Release(plugInInterface);
         if (result || !dev) {
             LOG(ERROR) << "Couldn't create a device interface (" << std::hex << result << ")";
+            (*iface)->Release(iface);
             continue;
         }
 
@@ -211,6 +214,8 @@
         if (kr == KERN_SUCCESS) {
             devpath = android::base::StringPrintf("usb:%" PRIu32 "X", locationId);
             if (IsKnownDevice(devpath)) {
+                (*dev)->Release(dev);
+                (*iface)->Release(iface);
                 continue;
             }
         }