Merge branch 'PHP-8.4'

Girgias · Girgias · commit eaf24ba4e200 · 2025-07-28T11:55:43.000+01:00
* PHP-8.4:
  ext/gd: Fix comparison with result of php_stream_can_cast()
diff --git a/NEWS b/NEWS
@@ -12,6 +12,9 @@ PHP                                                                        NEWS
   . Add support for CURLINFO_QUEUE_TIME_T in curl_getinfo() (thecaliskan)
   . Add support for CURLOPT_SSL_SIGNATURE_ALGORITHMS. (Ayesh Karunaratne)
 
+- GD:
+  . Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
+
 - OPcache:
   . Disallow changing opcache.memory_consumption when SHM is already set up.
     (timwolla)
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -1573,7 +1573,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		pefree(pstr, 1);
 		zend_string_release_ex(buff, 0);
 	}
-	else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {
+	else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO) == SUCCESS) {
 		/* try and force the stream to be FILE* */
 		if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO | PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
 			goto out_err;

Original file line number	Diff line number	Diff line change
`@@ -1573,7 +1573,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,`
`1573`	`1573`	`pefree(pstr, 1);`
`1574`	`1574`	`zend_string_release_ex(buff, 0);`
`1575`	`1575`	`}`
`1576`		`- else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {`
	`1576`	`+ else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO) == SUCCESS) {`
`1577`	`1577`	`/* try and force the stream to be FILE* */`
`1578`	`1578`	`if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO \| PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {`
`1579`	`1579`	`goto out_err;`