From 4e5c80034ea775431d66d420e4a95eee17b0af92 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 8 Jan 2014 11:44:48 -0600
Subject: [PATCH] [libpng17] Only issue a warning about image width if an error
 has not already

been found in IHDR.
---
 png.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/png.c b/png.c
index 9f838927b..c11d13a4d 100644
--- a/png.c
+++ b/png.c
@@ -696,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.7.0beta27 - January 7, 2014" PNG_STRING_NEWLINE \
+     "libpng version 1.7.0beta27 - January 8, 2014" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.7.0beta27 - January 7, 2014\
+      return "libpng version 1.7.0beta27 - January 8, 2014\
       Copyright (c) 1998-2014 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -2381,7 +2381,7 @@ png_check_IHDR(png_const_structrp png_ptr,
       error = 1;
    }
 
-   if (width > (PNG_UINT_32_MAX
+   if (error == 0 && width > (PNG_UINT_32_MAX
                  >> 3)      /* 8-byte RGBA pixels */
                  - 48       /* bigrowbuf hack */
                  - 1        /* filter byte */