sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosted/bmp_libusb: Fixed some signed/unsigned issues and UB in send_recv

This commit is contained in:
dragonmux 2022-04-01 00:43:57 -04:00 committed by Rachel Mant
parent c5dbf851f6
commit c7eba0a439
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platforms/hosted/bmp_libusb.c
View File

@ -389,15 +389,14 @@ int send_recv(usb_link_t *link,
{ {
int res = 0; int res = 0;
if (txsize) { if (txsize) {
int txlen = txsize;
libusb_fill_bulk_transfer(link->req_trans, libusb_fill_bulk_transfer(link->req_trans,
link->ul_libusb_device_handle, link->ul_libusb_device_handle,
link->ep_tx | LIBUSB_ENDPOINT_OUT, link->ep_tx | LIBUSB_ENDPOINT_OUT,
txbuf, txlen, txbuf, txsize,
NULL, NULL, 0); NULL, NULL, 0);
size_t i = 0; size_t i = 0;
DEBUG_WIRE(" Send (%3d): ", txlen); DEBUG_WIRE(" Send (%3zu): ", txsize);
for (; i < txlen; ++i) { for (; i < txsize; ++i) {
DEBUG_WIRE("%02x", txbuf[i]); DEBUG_WIRE("%02x", txbuf[i]);
if ((i & 7U) == 7U) if ((i & 7U) == 7U)
DEBUG_WIRE("."); DEBUG_WIRE(".");
@ -425,12 +424,12 @@ int send_recv(usb_link_t *link,
} }
res = link->rep_trans->actual_length; res = link->rep_trans->actual_length;
if (res > 0) { if (res > 0) {
uint8_t *p = rxbuf; const size_t rxlen = (size_t)res;
DEBUG_WIRE(" Rec (%zu/%d)", rxsize, res); DEBUG_WIRE(" Rec (%zu/%zu)", rxsize, rxlen);
for (size_t i = 0; i < res && i < 32 ; ++i) { for (size_t i = 0; i < rxlen && i < 32 ; ++i) {
if (i && ((i & 7U) == 0U)) if (i && ((i & 7U) == 0U))
DEBUG_WIRE("."); DEBUG_WIRE(".");
DEBUG_WIRE("%02x", p[i]); DEBUG_WIRE("%02x", rxbuf[i]);
} }
} }
} }