| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From 9f2ad4928e47036cf1ac9b8fe45a491f15be2324 Mon Sep 17 00:00:00 2001 |
| 2 | From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> |
| 3 | Date: Wed, 4 Nov 2015 23:47:42 -0600 |
| 4 | Subject: [PATCH] [libpng16] Fixed new bug with CRC error after reading an |
| 5 | over-length palette. |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | CVE: CVE-2015-8472 |
| 9 | |
| 10 | https://github.com/glennrp/libpng/commit/9f2ad4928e47036cf1ac9b8fe45a491f15be2324 |
| 11 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 12 | |
| 13 | --- |
| 14 | pngrutil.c | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | Index: libpng-1.6.17/pngrutil.c |
| 18 | =================================================================== |
| 19 | --- libpng-1.6.17.orig/pngrutil.c |
| 20 | +++ libpng-1.6.17/pngrutil.c |
| 21 | @@ -973,7 +973,7 @@ png_handle_PLTE(png_structrp png_ptr, pn |
| 22 | if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) |
| 23 | #endif |
| 24 | { |
| 25 | - png_crc_finish(png_ptr, 0); |
| 26 | + png_crc_finish(png_ptr, (int) length - num * 3); |
| 27 | } |
| 28 | |
| 29 | #ifndef PNG_READ_OPT_PLTE_SUPPORTED |