diff options
| author | Niklas Gürtler <niklas.guertler@tacterion.com> | 2023-04-03 16:00:37 +0200 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@google.com> | 2023-04-12 13:06:57 -0600 |
| commit | c5aec6bd678cddfab87df35de2c133f51bc8cce9 (patch) | |
| tree | 52734d1052e71aa75a1b88a20824a3fd652044a4 /libusb/io.c | |
| parent | 84ac0b0f60323fab7ae765b2119df6149968b6e2 (diff) | |
| download | libusb-c5aec6bd678cddfab87df35de2c133f51bc8cce9.tar.gz | |
Fix #1263 by acquiring the waiters lock while calling transfer callbacks and swapping the order of operations in sync_transfer_cb
Fixes #1267, #1263
Signed-off-by: Nathan Hjelm <hjelmn@google.com>
Diffstat (limited to 'libusb/io.c')
| -rw-r--r-- | libusb/io.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libusb/io.c b/libusb/io.c index 7c20a7e..36e0b81 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -1719,8 +1719,11 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, transfer->actual_length = itransfer->transferred; usbi_dbg(ctx, "transfer %p has callback %p", (void *) transfer, transfer->callback); - if (transfer->callback) + if (transfer->callback) { + libusb_lock_event_waiters (ctx); transfer->callback(transfer); + libusb_unlock_event_waiters(ctx); + } /* transfer might have been freed by the above call, do not use from * this point. */ if (flags & LIBUSB_TRANSFER_FREE_TRANSFER) |