commit 4d967c003588b14490a984d27a55be80ea76379b
author Alexey Polyudov <apolyudov@google.com> Wed Jan 04 03:28:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 03:28:42 2017 +0000
tree a87054306d2916f7b7062db17c213c4a52285e7c
parent 273aee7dd9216edbaf5d883f3a4d3f94618ab60d
parent d274b0d6f9b6c70e83335756e540796932e63232

Merge "gatekeeperd: protect from invalid data passed by HAL" into nyc-mr2-dev

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;
             }
         }