From fbdaee2d3ef393d67386c1a07a9b71f6b6ef3b25 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 12 Jun 2018 16:08:26 -0500 Subject: [PATCH 3/3] Fix CVE-2018-11813 Refer to change log for details. Fixes #242 --- rdtarga.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rdtarga.c b/rdtarga.c index d305f1f..459e8b3 100644 --- a/rdtarga.c +++ b/rdtarga.c @@ -123,11 +123,10 @@ METHODDEF(void) read_non_rle_pixel (tga_source_ptr sinfo) /* Read one Targa pixel from the input file; no RLE expansion */ { - register FILE *infile = sinfo->pub.input_file; register int i; for (i = 0; i < sinfo->pixel_size; i++) { - sinfo->tga_pixel[i] = (U_CHAR) getc(infile); + sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); } } @@ -136,7 +135,6 @@ METHODDEF(void) read_rle_pixel (tga_source_ptr sinfo) /* Read one Targa pixel from the input file, expanding RLE data as needed */ { - register FILE *infile = sinfo->pub.input_file; register int i; /* Duplicate previously read pixel? */ @@ -158,7 +156,7 @@ read_rle_pixel (tga_source_ptr sinfo) /* Read next pixel */ for (i = 0; i < sinfo->pixel_size; i++) { - sinfo->tga_pixel[i] = (U_CHAR) getc(infile); + sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); } } -- 2.17.2