Merge "Structure device not freed in error case"

2014-02-18 17:12:14 +00:00
parent 02a64daefe 9bd36ef2f7
commit 60097a9c5a
1 changed files with 3 additions and 1 deletions
--- a/services/jni/com_android_server_UsbHostManager.cpp
+++ b/services/jni/com_android_server_UsbHostManager.cpp
@@ -163,8 +163,10 @@ static jobject android_server_UsbHostManager_openDevice(JNIEnv *env, jobject thi
        return NULL;

    int fd = usb_device_get_fd(device);
-    if (fd < 0)
+    if (fd < 0) {
+        usb_device_close(device);
        return NULL;
+    }
    int newFD = dup(fd);
    usb_device_close(device);