From 3939689e7d9d06ee05411210bc8e605adcff294e Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 4 Nov 2015 23:42:05 -0600
Subject: [PATCH] [libpng12] Fixed new bug with CRC error after reading an
 over-length palette.

---
 pngrutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pngrutil.c b/pngrutil.c
index 9ed1ae24..bc552ccc 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.2.54 [November 3, 2015]
+ * Last changed in libpng 1.2.54 [November 5, 2015]
  * Copyright (c) 1998-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -603,7 +603,7 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
 #endif
    {
-      png_crc_finish(png_ptr, 0);
+      png_crc_finish(png_ptr, (int) length - num * 3);
    }
 #ifndef PNG_READ_OPT_PLTE_SUPPORTED
    else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */