cvs: gd /libgd/src gd_crop.c gd_tiff.c

tabe		Wed Mar  4 11:55:18 2009 UTC

  Modified files:              
    /gd/libgd/src	gd_crop.c gd_tiff.c 
  Log:
  check whether a new image is null or not.
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_crop.c?r1=1.7&r2=1.8&diff_format=u
Index: gd/libgd/src/gd_crop.c
diff -u gd/libgd/src/gd_crop.c:1.7 gd/libgd/src/gd_crop.c:1.8
--- gd/libgd/src/gd_crop.c:1.7	Wed Nov 26 13:43:45 2008
+++ gd/libgd/src/gd_crop.c	Wed Mar  4 11:55:18 2009
@@ -19,6 +19,7 @@
 	gdImagePtr dst;
 
 	dst = gdImageCreateTrueColor(crop->width, crop->height);
+	if (!dst) return NULL;
 	gdImageCopy(dst, src, 0, 0, crop->x, crop->y, crop->width, crop->height);
 
 	return dst;
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tiff.c?r1=1.20&r2=1.21&diff_format=u
Index: gd/libgd/src/gd_tiff.c
diff -u gd/libgd/src/gd_tiff.c:1.20 gd/libgd/src/gd_tiff.c:1.21
--- gd/libgd/src/gd_tiff.c:1.20	Mon Dec 31 11:33:13 2007
+++ gd/libgd/src/gd_tiff.c	Wed Mar  4 11:55:18 2009
@@ -27,7 +27,7 @@
 
    ----------------------------------------------------------------------------
  */
-/* $Id: gd_tiff.c,v 1.20 2007/12/31 11:33:13 chapg Exp $ */
+/* $Id: gd_tiff.c,v 1.21 2009/03/04 11:55:18 tabe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -910,9 +910,11 @@
 	if (!force_rgba && 
 			(image_type == GD_PALETTE || image_type == GD_INDEXED || image_type == GD_GRAY)) {
 		im = gdImageCreate(width, height);
+		if (!im) goto error;
 		readTiffColorMap(im, tif, is_bw, photometric);
 	} else {
 		im = gdImageCreateTrueColor(width, height);
+		if (!im) goto error;
 	}
 
 #ifdef DEBUG