raise ValueError from imagecreate/imagecreatetruecolor

salathe · salathe · commit a43679632b97 · 2019-09-09T21:06:00.000+01:00
Raise a ValueError instead of a plain Error when calling imagecreate()
or imagecreatetruecolor() with too big or small values for the width or
height arguments.
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -829,12 +829,12 @@ PHP_FUNCTION(imagecreatetruecolor)
 	}
 
 	if (x_size <= 0 || x_size >= INT_MAX) {
-		zend_throw_error(NULL, "Invalid width (x_size)");
+		zend_value_error("Invalid width (x_size)");
 		return;
 	}
 
 	if (y_size <= 0 || y_size >= INT_MAX) {
-		zend_throw_error(NULL, "Invalid height (y_size)");
+		zend_value_error("Invalid height (y_size)");
 		return;
 	}
 
@@ -1473,12 +1473,12 @@ PHP_FUNCTION(imagecreate)
 	}
 
 	if (x_size <= 0 || x_size >= INT_MAX) {
-		zend_throw_error(NULL, "Invalid width (x_size)");
+		zend_value_error("Invalid width (x_size)");
 		return;
 	}
 
 	if (y_size <= 0 || y_size >= INT_MAX) {
-		zend_throw_error(NULL, "Invalid height (y_size)");
+		zend_value_error("Invalid height (y_size)");
 		return;
 	}
 
diff --git a/ext/gd/tests/imagecreate_error.phpt b/ext/gd/tests/imagecreate_error.phpt
@@ -17,5 +17,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [Error] Invalid width (x_size)
-!! [Error] Invalid height (y_size)
+!! [ValueError] Invalid width (x_size)
+!! [ValueError] Invalid height (y_size)
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -19,5 +19,5 @@ trycatch_dump(
 
 ?>
 --EXPECT--
-!! [Error] Invalid width (x_size)
-!! [Error] Invalid height (y_size)
+!! [ValueError] Invalid width (x_size)
+!! [ValueError] Invalid height (y_size)

Original file line number	Diff line number	Diff line change
`@@ -829,12 +829,12 @@ PHP_FUNCTION(imagecreatetruecolor)`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`if (x_size <= 0 \|\| x_size >= INT_MAX) {`
`832`		`- zend_throw_error(NULL, "Invalid width (x_size)");`
	`832`	`+ zend_value_error("Invalid width (x_size)");`
`833`	`833`	`return;`
`834`	`834`	`}`
`835`	`835`
`836`	`836`	`if (y_size <= 0 \|\| y_size >= INT_MAX) {`
`837`		`- zend_throw_error(NULL, "Invalid height (y_size)");`
	`837`	`+ zend_value_error("Invalid height (y_size)");`
`838`	`838`	`return;`
`839`	`839`	`}`
`840`	`840`
`@@ -1473,12 +1473,12 @@ PHP_FUNCTION(imagecreate)`
`1473`	`1473`	`}`
`1474`	`1474`
`1475`	`1475`	`if (x_size <= 0 \|\| x_size >= INT_MAX) {`
`1476`		`- zend_throw_error(NULL, "Invalid width (x_size)");`
	`1476`	`+ zend_value_error("Invalid width (x_size)");`
`1477`	`1477`	`return;`
`1478`	`1478`	`}`
`1479`	`1479`
`1480`	`1480`	`if (y_size <= 0 \|\| y_size >= INT_MAX) {`
`1481`		`- zend_throw_error(NULL, "Invalid height (y_size)");`
	`1481`	`+ zend_value_error("Invalid height (y_size)");`
`1482`	`1482`	`return;`
`1483`	`1483`	`}`
`1484`	`1484`