Fix most external GD 2.3.3 compatibility

orlitzky · nielsdos · commit 0aaad46c15b2 · 2023-07-06T21:39:40.000+02:00
* ext/gd/tests/bug45799.phpt: tweak to work with external gd. The expected output from this test contains an extra newline with gd-2.3.3 from the system (Gentoo). Adding a whitespace wildcard takes care of it, and the test still passes with the bundled version of gd. * ext/gd/tests: external gd-2.3.3 compatibility. Support for the legacy "gd" image format was removed from gd-2.3.3 upstream: https://github.com/libgd/libgd/blob/master/CHANGELOG.md#233---2021-09-12 Several tests for the gd extension utilize that format, and naturally fail when gd-2.3.3 from the system is used. This commit skips those tests when the version of gd is at least 2.3.3. * ext/gd/tests/bug73159.phpt: skip with external gd >= 2.3.3 This test uses the imagegd2() function to check that libgd/libgd#289 is fixed. When an external gd without support for the "gd" format is used, no error is thrown, but a nonsense result is printed: this is normal. The corresponding upstream test is disabled in that situation; it's not expected to work. This commit skips the corresponding PHP test under the same circumstances to fix a test failure with external gd >= 2.3.3. * ext/gd/tests/bug73155.phpt: skip with external gd >= 2.3.3 This test uses the imagegd2() function to check that libgd/libgd#309 is fixed. When an external gd without support for the "gd" format is used, no error is thrown, but a nonsense result is printed: this is normal. The corresponding upstream test is disabled in that situation; it's not expected to work. This commit skips the corresponding PHP test under the same circumstances to fix a test failure with external gd >= 2.3.3. * ext/gd/tests/bug73157.phpt: skip with external gd >= 2.3.3 This test ensures that the third (chunk_size) parameter to imagegd2() is respected when a fourth parameter is also given. However, when an external gd without support for the "gd" format is used, the call to imagegd2() does not really work at all. It doesn't fail, but it produces an "image" with a nonsense chunk size. To avoid failures when an external gd >= 2.3.3 is used, we skip the test entirely in that case. * ext/gd/tests/bug77973.phpt: accept lowercase "Invalid" This test fails with an external gd because the test expects "Invalid" where upstream gd says "invalid". This commit tweaks the expected output to accept an arbitrary character in the i/I position. * ext/gd/tests/bug39780_extern.phpt: update for external gd-2.3.3. Since there are no CI runs with external gd, I can only assume that this test has fallen out-of-date due to changes in PHP itself. I've tweaked the expected output (only slightly) so that the test passes with both gd-2.3.2 and gd-2.3.3. * ext/gd/tests/bug66356.phpt: update expected output for external gd. Newer (external) versions of GD start their error messages with lowercase characters, whereas this test is expecting them in uppercase. A single-character wildcard now supports both formats. * ext/gd/tests/imagegd_truecolor.phpt: skip with external gd >= 2.3.3. This test uses the imagegd() function, but the "gd" format has been disabled by default in upstream gd-2.3.3. We still get some kind of image data back from the call to imagegd(), but its "signature", "truecolor", and "size" no longer match the expected values. This commit skips the test when an external gd >= 2.3.3 is used. * ext/gd/tests/createfromwbmp2_extern.phpt: update for external gd-2.3.3. * ext/gd/tests/libgd00086_extern.phpt: update for external gd-2.3.3. Since there are no CI runs with external gd, I can only assume that this test has fallen out-of-date due to changes in PHP itself. I've tweaked the expected output (only slightly) so that the test passes with both gd-2.3.2 and gd-2.3.3. * ext/gd/tests/bug77272.phpt: update expected output for external gd. Newer (external) versions of GD start their error messages with lowercase characters, whereas this test is expecting them in uppercase. A single-character wildcard now supports both formats. * ext/gd/tests/bug77479.phpt: update for newer external gd. This test fails with gd-2.3.3 (at least) due to minor capitalization and whitespace issues. We add some wildcards to account for the difference. Closes GH-11257. Closes GH-11262. Closes GH-11264. Closes GH-11280.
diff --git a/NEWS b/NEWS
@@ -22,6 +22,9 @@ PHP                                                                        NEWS
 - FTP:
   . Fix context option check for "overwrite". (JonasQuinten)
 
+- GD:
+  . Fix most of the external libgd test failures. (Michael Orlitzky)
+
 - MBString:
   . Fix GH-11300 (license issue: restricted unicode license headers).
     (nielsdos)
diff --git a/ext/gd/tests/bug38212-mb.phpt b/ext/gd/tests/bug38212-mb.phpt
@@ -2,6 +2,12 @@
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug38212.phpt b/ext/gd/tests/bug38212.phpt
@@ -2,6 +2,12 @@
 Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 require __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
@@ -13,7 +13,9 @@ $im = imagecreatefrompng(__DIR__ . '/bug39780.png');
 var_dump($im);
 ?>
 --EXPECTF--
-gd-png:  fatal libpng error: Read Error: truncated data
-gd-png error: setjmp returns error condition 2
-Warning: imagecreatefrompng(): v%sbug39780.png" is not a valid PNG file in /%s on line %d
+Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data%win %s on line %d
+
+Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition %d%win %s on line %d
+
+Warning: imagecreatefrompng(): "%sbug39780.png" is not a valid PNG file in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug41442.phpt b/ext/gd/tests/bug41442.phpt
@@ -4,6 +4,10 @@ Bug #41442 (imagegd2() under output control)
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagegd2")) {
         die("skip GD2 support unavailable");
     }
diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
@@ -9,4 +9,4 @@ imagepng($img);
 imagedestroy($img);
 ?>
 --EXPECTF--
-Warning: imagepng(): gd-png error: no colors in palette in %s on line %d
+Warning: imagepng(): gd-png error: no colors in palette%win %s on line %d
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
@@ -38,14 +38,14 @@ Array
     [height] => 10
 )
 
-Warning: imagecrop(): One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
+Warning: imagecrop(): %cne parameter to a memory allocation multiplication is negative or zero, failing operation gracefully
  in %s on line %d
 bool(false)
 object(GdImage)#2 (0) {
 }
 object(GdImage)#2 (0) {
 }
 
-Warning: imagecrop(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecrop(): %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug71912-mb.phpt b/ext/gd/tests/bug71912-mb.phpt
@@ -4,6 +4,14 @@ Bug #71912 (libgd: signedness vulnerability)
 gd
 --SKIPIF--
 <?php
+        if (!GD_BUNDLED) {
+            if (version_compare(GD_VERSION, '2.2.0', '<')) {
+                die("skip test requires GD 2.2.0 or higher");
+            }
+            if (version_compare(GD_VERSION, '2.3.3', '>=')) {
+                die("skip test requires GD 2.3.2 or older");
+            }
+        }
         if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available');
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt
@@ -4,8 +4,13 @@ Bug #71912 (libgd: signedness vulnerability)
 gd
 --SKIPIF--
 <?php
-        if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
-            die("skip test requires GD 2.2.0 or higher");
+        if (!GD_BUNDLED) {
+            if (version_compare(GD_VERSION, '2.2.0', '<')) {
+                die("skip test requires GD 2.2.0 or higher");
+            }
+            if (version_compare(GD_VERSION, '2.3.3', '>=')) {
+                die("skip test requires GD 2.3.2 or older");
+            }
         }
         if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available');
 ?>
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
@@ -5,8 +5,14 @@ gd
 --SKIPIF--
 <?php
 if (!function_exists("imagecreatefromgd2")) print "skip";
-if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-    die("skip test requires GD 2.2.2 or higher");
+
+if (!GD_BUNDLED) {
+    if (version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
+    if (version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug73155.phpt b/ext/gd/tests/bug73155.phpt
@@ -2,6 +2,12 @@
 Bug #73155 (imagegd2() writes wrong chunk sizes on boundaries)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 $im = imagecreate(64, 64);
diff --git a/ext/gd/tests/bug73157.phpt b/ext/gd/tests/bug73157.phpt
@@ -2,6 +2,12 @@
 Bug #73157 (imagegd2() ignores 3rd param if 4 are given)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 $im = imagecreate(8, 8);
diff --git a/ext/gd/tests/bug73159.phpt b/ext/gd/tests/bug73159.phpt
@@ -2,6 +2,12 @@
 Bug #73159 (imagegd2(): unrecognized formats may result in corrupted files)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 $im = imagecreatetruecolor(10, 10);
diff --git a/ext/gd/tests/bug73161.phpt b/ext/gd/tests/bug73161.phpt
@@ -4,6 +4,12 @@ Bug #73161 (imagecreatefromgd2() may leak memory)
 We're testing for a memory leak that might not even show up with valgrind.
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 $im = imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73161.gd2');
diff --git a/ext/gd/tests/bug73868.phpt b/ext/gd/tests/bug73868.phpt
@@ -2,6 +2,12 @@
 Bug 73868 (DOS vulnerability in gdImageCreateFromGd2Ctx())
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73868.gd2'));
diff --git a/ext/gd/tests/bug73869.phpt b/ext/gd/tests/bug73869.phpt
@@ -2,6 +2,12 @@
 Bug #73869 (Signed Integer Overflow gd_io.c)
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73869a.gd2'));
diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt
@@ -16,6 +16,6 @@ $img = imagecreate(2**28, 1);
 var_dump(imagescale($img, 1, 1, IMG_TRIANGLE));
 ?>
 --EXPECTF--
-Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagescale():%S %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/bug77479.phpt b/ext/gd/tests/bug77479.phpt
@@ -15,10 +15,10 @@ imagecolorallocate($im, 0, 0, 0);
 imagewbmp($im, __DIR__ . '/77479.wbmp');
 ?>
 --EXPECTF--
-Warning: imagewbmp():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagewbmp():%S %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %s on line %d
 
-Warning: imagewbmp(): Could not create WBMP in %s on line %d
+Warning: imagewbmp(): Could not create WBMP%win %s on line %d
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/77479.wbmp');
diff --git a/ext/gd/tests/bug77973.phpt b/ext/gd/tests/bug77973.phpt
@@ -15,7 +15,7 @@ $im = imagecreatefromxbm($filepath);
 var_dump($im);
 ?>
 --EXPECTF--
-Warning: imagecreatefromxbm(): Invalid XBM in %s on line %d
+Warning: imagecreatefromxbm(): %cnvalid XBM in %s on line %d
 
 Warning: imagecreatefromxbm(): "%s" is not a valid XBM file in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/crafted_gd2.phpt b/ext/gd/tests/crafted_gd2.phpt
@@ -2,6 +2,12 @@
 Test max colors for a gd image.
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 imagecreatefromgd(__DIR__ . '/crafted.gd2');
diff --git a/ext/gd/tests/createfromgd2.phpt b/ext/gd/tests/createfromgd2.phpt
@@ -4,6 +4,9 @@ imagecreatefromgd2
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
         if (!function_exists('imagecreatefromgd2')) die("skip gd extension not available\n");
 ?>
 --FILE--
diff --git a/ext/gd/tests/createfromwbmp2_extern.phpt b/ext/gd/tests/createfromwbmp2_extern.phpt
@@ -43,6 +43,6 @@ $im = imagecreatefromwbmp($filename);
 unlink($filename);
 ?>
 --EXPECTF--
-gd warning: Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
+Warning: imagecreatefromwbmp(): %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully%win %s on line %d
 
 Warning: imagecreatefromwbmp(): "%s_tmp.wbmp" is not a valid WBMP file in %s on line %d
diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
@@ -4,6 +4,10 @@ gif --> gd1/gd2 conversion test
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagecreatefromgif")) {
         die("skip gif read support unavailable");
     }
diff --git a/ext/gd/tests/imagegd_truecolor.phpt b/ext/gd/tests/imagegd_truecolor.phpt
@@ -2,6 +2,12 @@
 imagegd() writes truecolor images without palette conversion
 --EXTENSIONS--
 gd
+--SKIPIF--
+<?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+?>
 --FILE--
 <?php
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt
@@ -4,6 +4,10 @@ jpeg <--> gd1/gd2 conversion test
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
@@ -4,6 +4,10 @@ jpeg <--> gd1/gd2 conversion test
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
         die("skip jpeg support unavailable");
     }
diff --git a/ext/gd/tests/libgd00086_extern.phpt b/ext/gd/tests/libgd00086_extern.phpt
@@ -13,8 +13,9 @@ $im = imagecreatefrompng(__DIR__ . '/libgd00086.png');
 var_dump($im);
 ?>
 --EXPECTF--
-gd-png:  fatal libpng error: Read Error: truncated data
-gd-png error: setjmp returns error condition 1
+Warning: imagecreatefrompng(): gd-png: fatal libpng error: Read Error: truncated data%win %s on line %d
+
+Warning: imagecreatefrompng(): gd-png error: setjmp returns error condition %d%win %s on line %d
 
 Warning: imagecreatefrompng(): "%slibgd00086.png" is not a valid PNG file in %s on line %d
 bool(false)
diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
@@ -4,6 +4,10 @@ png <--> gd1/gd2 conversion test
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
         die("skip png support unavailable");
     }
diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
@@ -4,6 +4,10 @@ xpm --> gd1/gd2 conversion test
 gd
 --SKIPIF--
 <?php
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.3', '>=')) {
+        die("skip test requires GD 2.3.2 or older");
+    }
+
     if (!function_exists("imagecreatefromxpm")) {
         die("skip xpm read support unavailable");
     }

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,14 @@ Array`
`38`	`38`	`[height] => 10`
`39`	`39`	`)`
`40`	`40`
`41`		`-Warning: imagecrop(): One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully`
	`41`	`+Warning: imagecrop(): %cne parameter to a memory allocation multiplication is negative or zero, failing operation gracefully`
`42`	`42`	`in %s on line %d`
`43`	`43`	`bool(false)`
`44`	`44`	`object(GdImage)#2 (0) {`
`45`	`45`	`}`
`46`	`46`	`object(GdImage)#2 (0) {`
`47`	`47`	`}`
`48`	`48`
`49`		`-Warning: imagecrop(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully`
	`49`	`+Warning: imagecrop(): %croduct of memory allocation multiplication would exceed INT_MAX, failing operation gracefully`
`50`	`50`	`in %s on line %d`
`51`	`51`	`bool(false)`