Removal of unnecessary tests, removal of image pointer validation

Author: marandall

ext/gd/gd.c

@@ -119,10 +119,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 			}
 	}
 
-	if ((im = gd_image_ptr_from_object_zval(imgind)) == NULL) {
-		return;
-
-	}
+	im = GD_IMAGE_PTR_FROM_ZVAL_P(imgind);
 
 	if (image_type != PHP_GDIMG_TYPE_BMP && argc >= 3) {
 		q = quality; /* or colorindex for foreground of BW images (defaults to black) */

ext/gd/gd_ctx.c

@@ -26,7 +26,8 @@
 
 zend_class_entry *gd_image_ce;
 
-static gdImagePtr gd_image_ptr_from_object_zval(zval* zptr);
+#define GD_IMAGE_PTR_FROM_ZVAL_P(x) (((gd_ext_image_object*)Z_OBJ_P(x))->image)
+
 static zend_object* gd_ext_image_object_init(zval* val, gdImagePtr image);
 
 typedef struct _gd_ext_image_object {

ext/gd/php_gd.h

@@ -31,7 +31,9 @@ var_dump(imagecreatefromstring($str2));
 
 echo "Done\n";
 ?>
---EXPECTF--
-resource(%d) of type (gd)
-resource(%d) of type (gd)
+--EXPECT--
+object(GdImage)#2 (0) {
+}
+object(GdImage)#2 (0) {
+}
 Done

ext/gd/tests/bug41442.phpt

@@ -28,8 +28,10 @@ var_dump(imagecrop($img, array("x" => 0x7fffff00, "y" => 0, "width" => 10, "heig
 var_dump(imagecrop($img, array("x" => 0, "y" => 0, "width" => 65535, "height" => 65535)));
 ?>
 --EXPECTF--
-resource(%d) of type (gd)
-resource(%d) of type (gd)
+object(GdImage)#2 (0) {
+}
+object(GdImage)#2 (0) {
+}
 Array
 (
     [x] => a
@@ -39,11 +41,13 @@ Array
 )
 
 Warning: imagecrop(): one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
- in %sbug66356.php on line %d
+ in %s on line %d
 bool(false)
-resource(%d) of type (gd)
-resource(%d) of type (gd)
+object(GdImage)#2 (0) {
+}
+object(GdImage)#2 (0) {
+}
 
 Warning: imagecrop(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
- in %sbug66356.php on line %d
+ in %s on line %d
 bool(false)

ext/gd/tests/bug66356.phpt

@@ -10,4 +10,5 @@ $img = imagerotate(imagecreate(10,10),45,0x7ffffff9);
 var_dump($img);
 ?>
 --EXPECT--
-resource(5) of type (gd)
+object(GdImage)#2 (0) {
+}

ext/gd/tests/bug70976.phpt

@@ -9,7 +9,6 @@ if (!extension_loaded('gd')) die('skip gd extension not available');
 $im = imagecreatefromxbm(__DIR__ . DIRECTORY_SEPARATOR . 'bug73968.xbm');
 var_dump($im);
 ?>
-===DONE===
---EXPECTF--
-resource(%d) of type (gd)
-===DONE===
+--EXPECT--
+object(GdImage)#1 (0) {
+}

ext/gd/tests/bug73968.phpt

@@ -21,7 +21,6 @@ for ($i = 0; $i < $width; $i += 16) {
     }
 }
 ?>
-===DONE===
---EXPECTF--
-resource(%d) of type (gd)
-===DONE===
+--EXPECT--
+object(GdImage)#1 (0) {
+}

ext/gd/tests/bug74435.phpt

@@ -10,9 +10,8 @@ memory_limit=2G
 --FILE--
 <?php
 $im = imagecreate(2**28, 1);
-if(is_resource($im)) {
-	imagescale($im, 1, 1, IMG_TRIANGLE);
-}
+imagescale($im, 1, 1, IMG_TRIANGLE);
+
 ?>
 ===DONE===
 --EXPECTF--

ext/gd/tests/bug77269.phpt

@@ -9,7 +9,6 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.5', '<=')) die('skip upstrea
 <?php
 var_dump(imagecreatefrombmp(__DIR__ . '/bug77391.bmp'));
 ?>
-===DONE===
---EXPECTF--
-resource(%d) of type (gd)
-===DONE===
+--EXPECT--
+object(GdImage)#1 (0) {
+}