cvs: gd(GD_2_0) /libgd NEWS gd.c

pajoye		Tue Jun 19 20:25:51 2007 UTC

  Modified files:              (Branch: GD_2_0)
    /gd/libgd	NEWS gd.c 
  Log:
  - MFH: #94, gdImageCreateXbm can crash if gdImageCreate fails
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/NEWS?r1=1.4.2.21&r2=1.4.2.22&diff_format=u
Index: gd/libgd/NEWS
diff -u gd/libgd/NEWS:1.4.2.21 gd/libgd/NEWS:1.4.2.22
--- gd/libgd/NEWS:1.4.2.21	Sat Jun  9 12:48:44 2007
+++ gd/libgd/NEWS	Tue Jun 19 20:25:51 2007
@@ -25,6 +25,7 @@
 87, Fixed segfault when an invalid color index is present in the image data
     Reported by Elliot <wccode at gmail dot com> (Pierre)
 89, Possible integer overflow in gdImageCreateTrueColor (Pierre)
+94, gdImageCreateXbm can crash if gdImageCreate fails (Pierre)
 
 GD 2.0.34 (2007-02-07)
  3, Initialize variables in tweenColorTest, fix cache
http://cvs.php.net/viewvc.cgi/gd/libgd/gd.c?r1=1.49.2.15&r2=1.49.2.16&diff_format=u
Index: gd/libgd/gd.c
diff -u gd/libgd/gd.c:1.49.2.15 gd/libgd/gd.c:1.49.2.16
--- gd/libgd/gd.c:1.49.2.15	Sun Jun 17 19:02:59 2007
+++ gd/libgd/gd.c	Tue Jun 19 20:25:51 2007
@@ -1,4 +1,4 @@
-/* $Id: gd.c,v 1.49.2.15 2007/06/17 19:02:59 nlopess Exp $ */
+/* $Id: gd.c,v 1.49.2.16 2007/06/19 20:25:51 pajoye Exp $ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -2855,6 +2855,10 @@
     }
   bytes = (w * h / 8) + 1;
   im = gdImageCreate (w, h);
+  if (!im) {
+    return 0;
+  }
+
   gdImageColorAllocate (im, 255, 255, 255);
   gdImageColorAllocate (im, 0, 0, 0);
   x = 0;