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

scanimage: Fix 32-bit overflow when calculating total bytes to transfer

merge-requests/234/head
Povilas Kanapickas 2019-11-09 22:58:30 +02:00
rodzic 71b817cef8
commit 9472dce5f7
1 zmienionych plików z 14 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
frontend/scanimage.c
Wyświetl plik

@ -32,6 +32,7 @@
#include <assert.h> #include <assert.h>
#include "lgetopt.h" #include "lgetopt.h"
#include <inttypes.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1317,7 +1318,8 @@ advance (Image * image)
static SANE_Status static SANE_Status
scan_it (FILE *ofp) scan_it (FILE *ofp)
{ {
int i, len, first_frame = 1, offset = 0, must_buffer = 0, hundred_percent; int i, len, first_frame = 1, offset = 0, must_buffer = 0;
uint64_t hundred_percent = 0;
SANE_Byte min = 0xff, max = 0; SANE_Byte min = 0xff, max = 0;
SANE_Parameters parm; SANE_Parameters parm;
SANE_Status status; SANE_Status status;
@ -1325,7 +1327,7 @@ scan_it (FILE *ofp)
static const char *format_name[] = { static const char *format_name[] = {
"gray", "RGB", "red", "green", "blue" "gray", "RGB", "red", "green", "blue"
}; };
SANE_Word total_bytes = 0, expected_bytes; uint64_t total_bytes = 0, expected_bytes;
SANE_Int hang_over = -1; SANE_Int hang_over = -1;
#ifdef HAVE_LIBPNG #ifdef HAVE_LIBPNG
int pngrow = 0; int pngrow = 0;
@ -1486,7 +1488,7 @@ scan_it (FILE *ofp)
offset = parm.format - SANE_FRAME_RED; offset = parm.format - SANE_FRAME_RED;
image.x = image.y = 0; image.x = image.y = 0;
} }
hundred_percent = parm.bytes_per_line * parm.lines hundred_percent = ((uint64_t)parm.bytes_per_line) * parm.lines
* ((parm.format == SANE_FRAME_RGB || parm.format == SANE_FRAME_GRAY) ? 1:3); * ((parm.format == SANE_FRAME_RGB || parm.format == SANE_FRAME_GRAY) ? 1:3);
while (1) while (1)
@ -1498,7 +1500,12 @@ scan_it (FILE *ofp)
if (progr > 100.) if (progr > 100.)
progr = 100.; progr = 100.;
if (progress) if (progress)
fprintf (stderr, "Progress: %3.1f%%\r", progr); {
if (parm.lines >= 0)
fprintf(stderr, "Progress: %3.1f%%\r", progr);
else
fprintf(stderr, "Progress: (unknown)\r");
}
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
@ -1760,7 +1767,7 @@ cleanup:
free (image.data); free (image.data);
expected_bytes = parm.bytes_per_line * parm.lines * expected_bytes = ((uint64_t)parm.bytes_per_line) * parm.lines *
((parm.format == SANE_FRAME_RGB ((parm.format == SANE_FRAME_RGB
|| parm.format == SANE_FRAME_GRAY) ? 1 : 3); || parm.format == SANE_FRAME_GRAY) ? 1 : 3);
if (parm.lines < 0) if (parm.lines < 0)
@ -1769,10 +1776,10 @@ cleanup:
{ {
fprintf (stderr, fprintf (stderr,
"%s: WARNING: read more data than announced by backend " "%s: WARNING: read more data than announced by backend "
"(%u/%u)\n", prog_name, total_bytes, expected_bytes); "(%" PRIu64 "/%" PRIu64 ")\n", prog_name, total_bytes, expected_bytes);
} }
else if (verbose) else if (verbose)
fprintf (stderr, "%s: read %u bytes in total\n", prog_name, total_bytes); fprintf (stderr, "%s: read %" PRIu64 " bytes in total\n", prog_name, total_bytes);
return status; return status;
} }