php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MFB: #39286, misleading error message when invalid dimensions are given

Browse Source
This commit is contained in:
Pierre Joye
2006-12-10 03:03:48 +00:00
parent a6ec097ef9
commit 80ecfc354e
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/gd/gd.c
+4
View File
@@ -2125,6 +2125,10 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zllll", &ppfilename, &srcx, &srcy, &width, &height) == FAILURE) {
return;
}
if (width < 1 || height < 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Zero width or height not allowed");
RETURN_FALSE;
}
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &ppfilename) == FAILURE) {
return;
ext/gd/tests/bug38212.phpt
+3 -2
View File
@@ -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
ext/gd/tests/bug39286.phpt
+14
View File
@@ -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