feedback

Author: devnexen

ext/gd/gd.c

@@ -2286,18 +2286,23 @@ PHP_FUNCTION(imagegammacorrect)
 		RETURN_THROWS();
 	}
 
+	if (!zend_finite(input)) {
+		zend_argument_value_error(2, "must be finite");
+		RETURN_THROWS();
+	}
+
 	if (output <= 0.0) {
 		zend_argument_value_error(3, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
-	gamma = input / output;
-
-	if (UNEXPECTED(!zend_finite(gamma))) {
-		zend_value_error("An input divided by an output must be finite");
+	if (!zend_finite(output)) {
+		zend_argument_value_error(3, "must be finite");
 		RETURN_THROWS();
 	}
 
+	gamma = input / output;
+
 	im = php_gd_libgdimageptr_from_zval_p(IM);
 
 	if (gdImageTrueColor(im))	{

ext/gd/tests/gh20551.phpt

@@ -6,17 +6,31 @@ gd
 <?php
 $im = imagecreate(64, 32);
 
-try {
-	imagegammacorrect($im, NAN, 1.0);
-} catch (\ValueError $e) {
-	echo $e->getMessage(), PHP_EOL;
-}
-try {
-	imagegammacorrect($im, -NAN, 1.0);
-} catch (\ValueError $e) {
-	echo $e->getMessage(), PHP_EOL;
+$gammas = [
+	[NAN, 1.0],
+	[-NAN, 1.0],
+	[INF, 1.0],
+	[-INF, 1.0],
+	[1.0, NAN],
+	[1.0, -NAN],
+	[1.0, INF],
+	[1.0, -INF],
+];
+
+foreach ($gammas as $gamma) {
+	try {
+		imagegammacorrect($im, $gamma[0], $gamma[1]);
+	} catch (\ValueError $e) {
+		echo $e->getMessage(), PHP_EOL;
+	}
 }
 ?>
 --EXPECT--
-An input divided by an output must be finite
-An input divided by an output must be finite
+imagegammacorrect(): Argument #2 ($input_gamma) must be finite
+imagegammacorrect(): Argument #2 ($input_gamma) must be finite
+imagegammacorrect(): Argument #2 ($input_gamma) must be finite
+imagegammacorrect(): Argument #2 ($input_gamma) must be greater than 0
+imagegammacorrect(): Argument #3 ($output_gamma) must be finite
+imagegammacorrect(): Argument #3 ($output_gamma) must be finite
+imagegammacorrect(): Argument #3 ($output_gamma) must be finite
+imagegammacorrect(): Argument #3 ($output_gamma) must be greater than 0