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