ext/gd: imagecrop rect argument overflow fixes.#18006
Closed
devnexen wants to merge 2 commits intophp:PHP-8.3from
Closed
ext/gd: imagecrop rect argument overflow fixes.#18006devnexen wants to merge 2 commits intophp:PHP-8.3from
devnexen wants to merge 2 commits intophp:PHP-8.3from
Conversation
Member
devnexen
commented
Mar 9, 2025
devnexen
commented
devnexen
force-pushed
the
gd_imagecrop_overflow
branch
from
8e7edeb to
6bbb567
Compare
cmb69
reviewed
Mar 9, 2025
Member
cmb69
left a comment
cmb69
left a comment
There was a problem hiding this comment.
Generally, good catch. Thank you!
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if ((rect.width > 0 && rect.x > INT_MAX - rect.width)) { |
Member
There was a problem hiding this comment.
I think we need to check already when assigning to the members of gdRect (which are ints) above.
And I'm not sure whether allowing negative values makes any sense; from a quick glance, that would be treated like zero. Maybe still support that for 8.3+, but additionally throw for master.
Member
Author
There was a problem hiding this comment.
I did some work on master prior, counting on this one before going further.
ext/gd/tests/imagecrop_overflow.phpt
Outdated
Comment on lines
2
to
3
| imagecrop() overflows when the combo x/width or y/height is over INT_MAX or | ||
| under INT_MIN. |
Member
There was a problem hiding this comment.
Please use a single line (see https://qa.php.net/phpt_details.php#test_section).
```
ext/gd/libgd/gd.c:2275:14: runtime error: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
#0 0x5d6a2103e1db in php_gd_gdImageCopy /home/dcarlier/Contribs/php-src/ext/gd/libgd/gd.c:2275
#1 0x5d6a210a2b63 in gdImageCrop /home/dcarlier/Contribs/php-src/ext/gd/libgd/gd_crop.c:57
php#2 0x5d6a21018ca4 in zif_imagecrop /home/dcarlier/Contribs/php-src/ext/gd/gd.c:3575
php#3 0x5d6a21e46e7a in ZEND_DO_ICALL_SPEC_RETVAL_USED_HANDLER /home/dcarlier/Contribs/php-src/Zend/zend_vm_execute.h:1337
php#4 0x5d6a221188da in execute_ex /home/dcarlier/Contribs/php-src/Zend/zend_vm_execute.h:57246
php#5 0x5d6a221366bd in zend_execute /home/dcarlier/Contribs/php-src/Zend/zend_vm_execute.h:61634
php#6 0x5d6a21d107a6 in zend_execute_scripts /home/dcarlier/Contribs/php-src/Zend/zend.c:1895
php#7 0x5d6a21a63409 in php_execute_script /home/dcarlier/Contribs/php-src/main/main.c:2529
php#8 0x5d6a22516d5e in do_cli /home/dcarlier/Contribs/php-src/sapi/cli/php_cli.c:966
php#9 0x5d6a2251981d in main /home/dcarlier/Contribs/php-src/sapi/cli/php_cli.c:1341
php#10 0x7f10d002a3b7 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
php#11 0x7f10d002a47a in __libc_start_main_impl ../csu/libc-start.c:360
php#12 0x5d6a20a06da4 in _start (/home/dcarlier/Contribs/php-src/sapi/cli/php+0x2806da4) (BuildId: d9a79c7e0e4872311439d7313cb3a81fe04190a2)
```
devnexen
force-pushed
the
gd_imagecrop_overflow
branch
from
6bbb567 to
5d6d4cf
Compare
Girgias
approved these changes
Mar 28, 2025
Member
Girgias
left a comment
Girgias
left a comment
There was a problem hiding this comment.
One test nits, but LGTM otherwise
ext/gd/tests/imagecrop_overflow.phpt
Outdated
| <?php | ||
| $img = imagecreatetruecolor(10, 10); | ||
|
|
||
| $arr = array("x" => 2147483647, "y" => 2147483647, "width" => 10, "height" => 10); |
Member
There was a problem hiding this comment.
Nit: Here and elsewhere.
Suggested change
| $arr = array("x" => 2147483647, "y" => 2147483647, "width" => 10, "height" => 10); | |
| $arr = ["x" => 2147483647, "y" => 2147483647, "width" => 10, "height" => 10]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
