Port "improve _gdImageFillTiled() internal function" #17356
Merged
Conversation
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
This improvement was done for libgd 2.1.0[1], and the erroneous calculation has been fixed as of libgd 2.2.0[2]. While we're at it we also add the overflow checks of external libgd; these are not really necessary, since `.sx * .sy` overflow was already prevented when the image has been created, and since we're using `safe_emalloc()` the `struct seg` overflow is also prevented. It should be noted that `overflow2()` prevents `int` overflow, while `safe_emalloc()` prevents `size_t` overflow, so the former is more restrictive. For parity with external libgd, this still appears to be a good thing. [1] <libgd/libgd@86a5deb> [2] <libgd/libgd@e87ec88>
|
Looks like a bit of a fix more than anything ? |
Like I wrote, the overflow checks are not necessary. And allocating a single large array instead of allocating an array per row is only an improvement. That said, I'm fine with targeting PHP-8.3. |
|
my bad did not read your comment. Either way I m fine, once the very minor issue is fixed. |
Argh, I hate when that happens (unused variable). |
devnexen
approved these changes
Jan 4, 2025
|
I've merged into master; I think that's good enough, and if someone complains, we can still consider to backport to lower branches. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This improvement was done for libgd 2.1.0[1], and the erroneous calculation has been fixed as of libgd 2.2.0[2].
While we're at it we also add the overflow checks of external libgd; these are not really necessary, since
.sx * .syoverflow was already prevented when the image has been created, and since we're usingsafe_emalloc()thestruct segoverflow is also prevented. It should be noted thatoverflow2()preventsintoverflow, whilesafe_emalloc()preventssize_toverflow, so the former is more restrictive. For parity with external libgd, this still appears to be a good thing.[1] libgd/libgd@86a5deb
[2] libgd/libgd@e87ec88