Revert GD changes

Girgias · Girgias · commit e26b3e9ea193 · 2022-12-30T15:53:37.000Z
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -1563,8 +1563,11 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		zend_string_release_ex(buff, 0);
 	}
 	/* try and force the stream to be FILE* */
-	else if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO | PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
-		goto out_err;
+	else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {
+		/* 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;
+		}
 	}
 
 	if (!im && fp) {

Original file line number	Diff line number	Diff line change
`@@ -1563,8 +1563,11 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,`
`1563`	`1563`	`zend_string_release_ex(buff, 0);`
`1564`	`1564`	`}`
`1565`	`1565`	`/* try and force the stream to be FILE* */`
`1566`		`- else if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO \| PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {`
`1567`		`- goto out_err;`
	`1566`	`+ else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {`
	`1567`	`+ /* try and force the stream to be FILE* */`
	`1568`	`+ if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO \| PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {`
	`1569`	`+ goto out_err;`
	`1570`	`+ }`
`1568`	`1571`	`}`
`1569`	`1572`
`1570`	`1573`	`if (!im && fp) {`