archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/gd: Fix comparison with result of php_stream_can_cast()

Browse source 
Closes GH-19107
This commit is contained in:
Gina Peter Banyard 2025-07-12 18:30:08 +01:00
parent 17df11e3f7
commit 83b8d2c290
No known key found for this signature in database
GPG key ID: F30F8C1ACF51943F
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -11,6 +11,9 @@ PHP NEWS
- FTP: - FTP:
. Fix theoretical issues with hrtime() not being available. (nielsdos) . Fix theoretical issues with hrtime() not being available. (nielsdos)
- GD:
. Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
- Hash: - Hash:
. Fix crash on clone failure. (nielsdos) . Fix crash on clone failure. (nielsdos)

2
ext/gd/gd.c
View file

@ -1566,7 +1566,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
pefree(pstr, 1); pefree(pstr, 1);
zend_string_release_ex(buff, 0); 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* */ /* 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)) { if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO | PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
goto out_err; goto out_err;