Merge branch 'PHP-8.3' into PHP-8.4

Girgias · Girgias · commit 19c84e2687d8 · 2025-07-28T11:55:14.000+01:00
* PHP-8.3:
  ext/gd: Fix comparison with result of php_stream_can_cast()
diff --git a/NEWS b/NEWS
@@ -15,6 +15,9 @@ PHP                                                                        NEWS
 - FTP:
   . Fix theoretical issues with hrtime() not being available. (nielsdos)
 
+- GD:
+  . Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
+
 - Hash:
   . Fix crash on clone failure. (nielsdos)
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -1610,7 +1610,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
`@@ -1610,7 +1610,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,`
`1610`	`1610`	`pefree(pstr, 1);`
`1611`	`1611`	`zend_string_release_ex(buff, 0);`
`1612`	`1612`	`}`
`1613`		`- else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {`
	`1613`	`+ else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO) == SUCCESS) {`
`1614`	`1614`	`/* try and force the stream to be FILE* */`
`1615`	`1615`	`if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO \| PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {`
`1616`	`1616`	`goto out_err;`