commit 0ffb71a6af67d70416adfe24a54a54108efe4d8a
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Feb 28 06:08:20 2009 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:11:02 2009 -0500
tree 2bf24870dfa713f006238996c9ed5a6d5bcb6e2f
parent 79134c69a43e313ef2bb3704262abbbad4d72124

Imported from libpng-1.4.0beta49.tar

pngread.c

diff --git a/pngread.c b/pngread.c
index 7f417f3..6812917 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.4.0 [February 14, 2009]
+ * Last changed in libpng 1.4.0 [February 28, 2009]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1377,8 +1377,15 @@
 #endif
    if (info_ptr->row_pointers == NULL)
    {
+#ifdef PNG_CALLOC_SUPPORTED
       info_ptr->row_pointers = (png_bytepp)png_calloc(png_ptr,
          info_ptr->height * png_sizeof(png_bytep));
+#else
+      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+         info_ptr->height * png_sizeof(png_bytep));
+      png_memset(info_ptr->row_pointers, 0,
+         info_ptr->height * png_sizeof(png_bytep));
+#endif
 #ifdef PNG_FREE_ME_SUPPORTED
       info_ptr->free_me |= PNG_FREE_ROWS;
 #endif