Skip to content

Fix crash when Android target SDK > 27 #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zoelam020 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix crash when Android target SDK > 27 #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ae7c3
Update android_usbfs.c
zoelam020 Dec 16, 2020
30f86a3
Update android_usbfs.c
zoelam020 Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion libuvccamera/src/main/jni/libusb/libusb/os/android_usbfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2726,6 +2726,9 @@ static int handle_iso_completion(struct libusb_device_handle *handle, // XXX add

usbi_mutex_lock(&itransfer->lock);
for (i = 0; i < num_urbs; i++) {
if(tpriv->iso_urbs == NULL){
return LIBUSB_TRANSFER_ERROR;
}
if (urb == tpriv->iso_urbs[i]) {
urb_idx = i + 1;
break;
Expand Down Expand Up @@ -2926,7 +2929,13 @@ static int reap_for_handle(struct libusb_device_handle *handle) {

usbi_dbg("urb type=%d status=%d transferred=%d",
urb->type, urb->status, urb->actual_length);


//if not check status, will crash when target > 27
//current error status is -108
if(urb->status == -108){
return LIBUSB_ERROR_OTHER;
}

switch (transfer->type) {
case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
return handle_iso_completion(handle, itransfer, urb);
Expand Down