| From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001 |
| From: DRC <information@libjpeg-turbo.org> |
| Date: Tue, 12 Jun 2018 16:08:26 -0500 |
| Subject: [PATCH] Fix CVE-2018-11813 |
| |
| Refer to change log for details. |
| |
| Fixes #242 |
| --- |
| ChangeLog.md | 14 ++++++++++++++ |
| rdtarga.c | 6 ++---- |
| 2 files changed, 16 insertions(+), 4 deletions(-) |
| |
| --- libjpeg-turbo-1.5.3/rdtarga.c |
| +++ libjpeg-turbo-1.5.3/rdtarga.c |
| @@ -125,11 +125,10 @@ |
| 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); |
| } |
| } |
| |
| @@ -138,7 +137,6 @@ |
| 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? */ |
| @@ -160,7 +158,7 @@ |
| |
| /* 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); |
| } |
| } |
| |