- #39286, misleading error message when nvalid dimensions are given

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f3667cbc210e0dccbc551540944b3164d390f2e4..f7786ce8174cbefb06d002f046848218bd59e74b 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2375,6 +2375,10 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 
        if (argc == 5 && image_type == PHP_GDIMG_TYPE_GD2PART) {
                multi_convert_to_long_ex(4, srcx, srcy, width, height);
+               if (Z_LVAL_PP(width) < 1 || Z_LVAL_PP(height) < 1) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING,"Zero width or height not allowed");
+                       RETURN_FALSE;
+               }
        }
 
        fn = Z_STRVAL_PP(file);

diff --git a/ext/gd/tests/bug38212.phpt b/ext/gd/tests/bug38212.phpt
index 0094712a553908b2f23fa599b7faf3ac95dfe57f..04c89fece4f64be2abc79eaec7d9f4c091e4568f 100644 (file)
--- a/ext/gd/tests/bug38212.phpt
+++ b/ext/gd/tests/bug38212.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imagecopy doen't copy alpha, palette to truecolor
+Bzg #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
 --SKIPIF--
 <?php
         if (!function_exists('imagecopy')) die("skip gd extension not available\n");
@@ -14,4 +14,5 @@ $im = imagecreatefromgd2part($file, 0,0, -25,10);
 unlink($file);
 ?>
 --EXPECTF--
-Warning: imagecreatefromgd2part(): '%sbug38212.gd2' is not a valid GD2 file in %sbug38212.php on line %d
+
+Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d

diff --git a/ext/gd/tests/bug39286.phpt b/ext/gd/tests/bug39286.phpt
new file mode 100644 (file)
index 0000000..3f2a178
--- /dev/null
+++ b/ext/gd/tests/bug39286.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #39508 (imagefill crashes with small images 3 pixels or less)
+--SKIPIF--
+<?php 
+       if (!extension_loaded('gd')) die("skip gd extension not available\n"); 
+       if (!GD_BUNDLED) die('skip external GD libraries always fail');
+?>
+--FILE--
+<?php
+$img =imagecreatefromgd2part("foo.png",0, 100, 0, 100);
+?>
+--EXPECTF--
+
+Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d