Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

Browse Source 
* commit '37d894a42b5744e3e5def5fbfcc641fe3afa2063':
  Structure device not freed in error case
This commit is contained in:
Jeff Sharkey
2014-02-18 17:22:15 +00:00
committed by Android Git Automerger
parent fef3dd01fb 37d894a42b
commit ab5280776f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_UsbHostManager.cpp
View File

@@ -163,8 +163,10 @@ static jobject android_server_UsbHostManager_openDevice(JNIEnv *env, jobject thi
return NULL; return NULL;
int fd = usb_device_get_fd(device); int fd = usb_device_get_fd(device);
if (fd < 0) if (fd < 0) {
usb_device_close(device);
return NULL; return NULL;
}
int newFD = dup(fd); int newFD = dup(fd);
usb_device_close(device); usb_device_close(device);