commit 16e11660fe775e7cf94f1313d5c5c6b23f5bd9ef
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Nov 01 14:13:40 2004 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:08:01 2009 -0500
tree 204dee855a762c4a6393e7fe29ed9461b7cfe929
parent 250dfe1777f2dc71d62050b84f5e849cce62e085

Imported from libpng-1.2.8beta1.tar

pngget.c

diff --git a/pngget.c b/pngget.c
index 1d1cc21..2c9b33d 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * libpng 1.2.7 - September 12, 2004
+ * libpng 1.2.8beta1 - November 1, 2004
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2004 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -557,9 +557,9 @@
          *interlace_type = info_ptr->interlace_type;
 
       /* check for potential overflow of rowbytes */
-      if (width == 0 || *width > PNG_UINT_31_MAX)
+      if (*width == 0 || *width > PNG_UINT_31_MAX)
         png_error(png_ptr, "Invalid image width");
-      if (height == 0 || *height > PNG_UINT_31_MAX)
+      if (*height == 0 || *height > PNG_UINT_31_MAX)
         png_error(png_ptr, "Invalid image height");
       if (info_ptr->width > (PNG_UINT_32_MAX
                  >> 3)      /* 8-byte RGBA pixels */