changes from feedback

Author: devnexen

ext/gd/gd.c

@@ -3645,13 +3645,13 @@ static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
 		Z_PARAM_ARRAY(hash_colors)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (ZEND_SIZE_T_INT_OVFL(scatter_sub)) {
-		zend_argument_value_error(3, "must not be greater than %d", INT_MAX);
+	if (scatter_sub < 0 || ZEND_SIZE_T_INT_OVFL(scatter_sub)) {
+		zend_argument_value_error(3, "must be between 0 and %d", INT_MAX);
 		RETURN_THROWS();
 	}
 
-	if (ZEND_SIZE_T_INT_OVFL(scatter_plus)) {
-		zend_argument_value_error(4, "must not be greater than %d", INT_MAX);
+	if (scatter_plus < 0 || ZEND_SIZE_T_INT_OVFL(scatter_plus)) {
+		zend_argument_value_error(4, "must be between 0 and %d", INT_MAX);
 		RETURN_THROWS();
 	}
 
@@ -3951,7 +3951,7 @@ PHP_FUNCTION(imagescale)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (tmp_m < GD_DEFAULT || tmp_m >= GD_METHOD_COUNT) {
-		zend_argument_value_error(4, "must be a valid mode");
+		zend_argument_value_error(4, "must be one of the GD_* constants");
 		RETURN_THROWS();
 	}
 
@@ -3974,17 +3974,13 @@ PHP_FUNCTION(imagescale)
 		}
 	}
 
-	if (tmp_w <= 0) {
-		RETURN_FALSE;
-	} else if (ZEND_SIZE_T_INT_OVFL(tmp_w)) {
-		zend_argument_value_error(2, "must be lower or equal to %d", INT_MAX);
+	if (tmp_w <= 0 || ZEND_SIZE_T_INT_OVFL(tmp_w)) {
+		zend_argument_value_error(2, "must be between 1 and %d", INT_MAX);
 		RETURN_THROWS();
 	}
 
-	if (tmp_h <= 0) {
-		RETURN_FALSE;
-	} else if (ZEND_SIZE_T_INT_OVFL(tmp_h)) {
-		zend_argument_value_error(3, "must be lower or equal to %d", INT_MAX);
+	if (tmp_h <= 0 || ZEND_SIZE_T_INT_OVFL(tmp_h)) {
+		zend_argument_value_error(3, "must be between 1 and %d", INT_MAX);
 		RETURN_THROWS();
 	}
 

ext/gd/tests/bug72337.phpt

@@ -6,13 +6,25 @@ gd
 <?php
 $im = imagecreatetruecolor(1, 1);
 try {
-	imagescale($im, 0, 0, -10);
+	imagescale($im, 1, 1, -10);
 } catch (\ValueError $e) {
 	echo $e->getMessage() . PHP_EOL;
 }
-imagescale($im, 0, 0, IMG_BICUBIC_FIXED);
+try {
+	imagescale($im, 0, 1, 0);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	imagescale($im, 1, 0, 0);
+} catch (\ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+imagescale($im, 1, 1, IMG_BICUBIC_FIXED);
 echo "OK";
 ?>
 --EXPECT--
-imagescale(): Argument #4 ($mode) must be a valid mode
+imagescale(): Argument #4 ($mode) must be one of the GD_* constants
+imagescale(): Argument #2 ($width) must be between 1 and 2147483647
+imagescale(): Argument #3 ($height) must be between 1 and 2147483647
 OK

ext/gd/tests/bug73957.phpt

@@ -19,4 +19,4 @@ try {
 }
 ?>
 --EXPECTF--
-imagescale(): Argument #2 ($width) must be lower or equal to %d
+imagescale(): Argument #2 ($width) must be between 1 and %d