mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

sanei_usb: Don't change input size variable in USBCALLS bulk code paths

merge-requests/83/head
Povilas Kanapickas 2019-04-27 12:16:08 +03:00
rodzic 18f9e5598c
commit d865705ef1
1 zmienionych plików z 10 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
sanei/sanei_usb.c
Wyświetl plik

@ -2197,9 +2197,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
#ifdef HAVE_USBCALLS #ifdef HAVE_USBCALLS
int rc; int rc;
char* buffer_ptr = (char*) buffer; char* buffer_ptr = (char*) buffer;
while (*size) size_t requested_size = *size;
while (requested_size)
{ {
ULONG ulToRead = (*size>MAX_RW)?MAX_RW:*size; ULONG ulToRead = (requested_size>MAX_RW)?MAX_RW:requested_size;
ULONG ulNum = ulToRead; ULONG ulNum = ulToRead;
DBG (5, "Entered usbcalls UsbBulkRead with dn = %d\n",dn); DBG (5, "Entered usbcalls UsbBulkRead with dn = %d\n",dn);
DBG (5, "Entered usbcalls UsbBulkRead with dh = %p\n",dh); DBG (5, "Entered usbcalls UsbBulkRead with dh = %p\n",dh);
@ -2217,7 +2218,7 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
if (rc || (ulNum!=ulToRead)) return SANE_STATUS_INVAL; if (rc || (ulNum!=ulToRead)) return SANE_STATUS_INVAL;
*size -=ulToRead; requested_size -=ulToRead;
buffer_ptr += ulToRead; buffer_ptr += ulToRead;
read_size += ulToRead; read_size += ulToRead;
} }
@ -2354,11 +2355,12 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
DBG (5, "Entered usbcalls UsbBulkWrite with bulk_out_ep = 0x%02x\n",devices[dn].bulk_out_ep); DBG (5, "Entered usbcalls UsbBulkWrite with bulk_out_ep = 0x%02x\n",devices[dn].bulk_out_ep);
DBG (5, "Entered usbcalls UsbBulkWrite with interface_nr = %d\n",devices[dn].interface_nr); DBG (5, "Entered usbcalls UsbBulkWrite with interface_nr = %d\n",devices[dn].interface_nr);
DBG (5, "Entered usbcalls UsbBulkWrite with usbcalls_timeout = %d\n",usbcalls_timeout); DBG (5, "Entered usbcalls UsbBulkWrite with usbcalls_timeout = %d\n",usbcalls_timeout);
while (*size) size_t requested_size = *size;
while (requested_size)
{ {
ULONG ulToWrite = (*size>MAX_RW)?MAX_RW:*size; ULONG ulToWrite = (requested_size>MAX_RW)?MAX_RW:requested_size;
DBG (5, "size requested to write = %lu, ulToWrite = %lu\n",(unsigned long) *size,ulToWrite); DBG (5, "size requested to write = %lu, ulToWrite = %lu\n",(unsigned long) requested_size,ulToWrite);
if (devices[dn].bulk_out_ep){ if (devices[dn].bulk_out_ep){
rc = UsbBulkWrite (dh, devices[dn].bulk_out_ep, devices[dn].interface_nr, rc = UsbBulkWrite (dh, devices[dn].bulk_out_ep, devices[dn].interface_nr,
ulToWrite, (char*) buffer, usbcalls_timeout); ulToWrite, (char*) buffer, usbcalls_timeout);
@ -2370,10 +2372,10 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
if (rc) return SANE_STATUS_INVAL; if (rc) return SANE_STATUS_INVAL;
*size -=ulToWrite; requested_size -=ulToWrite;
buffer += ulToWrite; buffer += ulToWrite;
write_size += ulToWrite; write_size += ulToWrite;
DBG (5, "size = %d, write_size = %d\n",*size, write_size); DBG (5, "size = %d, write_size = %d\n", requested_size, write_size);
} }
#else /* not HAVE_USBCALLS */ #else /* not HAVE_USBCALLS */
{ {