cvs: gd(GD_2_0) /libgd/src gd_png.c /libgd/src/tests/png CMakeLists.txt Makefile.am bug00193.c

tabe		Fri Mar 13 20:26:55 2009 UTC

  Added files:                 (Branch: GD_2_0)
    /gd/libgd/src/tests/png	bug00193.c 

  Modified files:              
    /gd/libgd/src	gd_png.c 
    /gd/libgd/src/tests/png	CMakeLists.txt Makefile.am 
  Log:
  MFH: fixed FS#193
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.21.2.4&r2=1.21.2.5&diff_format=u
Index: gd/libgd/src/gd_png.c
diff -u gd/libgd/src/gd_png.c:1.21.2.4 gd/libgd/src/gd_png.c:1.21.2.5
--- gd/libgd/src/gd_png.c:1.21.2.4	Sat Nov 17 21:55:24 2007
+++ gd/libgd/src/gd_png.c	Fri Mar 13 20:26:55 2009
@@ -1,4 +1,4 @@
-/* $Id: gd_png.c,v 1.21.2.4 2007/11/17 21:55:24 pajoye Exp $ */
+/* $Id: gd_png.c,v 1.21.2.5 2009/03/13 20:26:55 tabe Exp $ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -587,6 +587,10 @@
 	      ++colors;
 	    }
 	}
+	  if (colors == 0) {
+		  fprintf(stderr, "gd-png error: no colors in palette\n");
+		  goto bail;
+	  }
       if (colors < im->colorsTotal)
 	{
 	  remap = TRUE;
@@ -836,6 +840,7 @@
 	}
     }
   /* 1.6.3: maybe we should give that memory BACK! TBB */
+ bail:
   png_destroy_write_struct (&png_ptr, &info_ptr);
 }
 
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/CMakeLists.txt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: gd/libgd/src/tests/png/CMakeLists.txt
diff -u gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.5 gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.6
--- gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.5	Wed Jan  7 15:12:51 2009
+++ gd/libgd/src/tests/png/CMakeLists.txt	Fri Mar 13 20:26:55 2009
@@ -4,6 +4,7 @@
 	bug00033
 	bug00086
 	bug00088
+	bug00193
 )
 
 FOREACH(test_name ${TESTS_FILES})
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/Makefile.am?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/src/tests/png/Makefile.am
diff -u gd/libgd/src/tests/png/Makefile.am:1.1.2.1 gd/libgd/src/tests/png/Makefile.am:1.1.2.2
--- gd/libgd/src/tests/png/Makefile.am:1.1.2.1	Mon Mar 10 12:33:36 2008
+++ gd/libgd/src/tests/png/Makefile.am	Fri Mar 13 20:26:55 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png emptyfile
+EXTRA_DIST = CMakeLists.txt bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/bug00193.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/png/bug00193.c
+++ gd/libgd/src/tests/png/bug00193.c