ext/gd: calls with array types check strengthening. #18005
+165
−15
Conversation
This file contains 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
Girgias
requested changes
Mar 8, 2025
ext/gd/gd.c
Outdated
Comment on lines
662
to
663
| } | ||
| stylearr[index++] = tmp; |
There was a problem hiding this comment.
Isn't there a possibility of int under/overflow ?
ext/gd/gd.c
Outdated
| @@ -3840,28 +3862,48 @@ PHP_FUNCTION(imagecrop) | |||
| im = php_gd_libgdimageptr_from_zval_p(IM); | |||
|
|
|||
| if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "x", sizeof("x") -1)) != NULL) { | |||
| rect.x = zval_get_long(tmp); | |||
| r = zval_get_long(tmp); | |||
ext/gd/gd.c
Outdated
| } else { | ||
| zend_argument_value_error(2, "must have an \"x\" key"); | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "y", sizeof("y") - 1)) != NULL) { | ||
| rect.y = zval_get_long(tmp); | ||
| r = zval_get_long(tmp); | ||
| if (ZEND_LONG_EXCEEDS_INT(r)) { |
ext/gd/gd.c
Outdated
| } else { | ||
| zend_argument_value_error(2, "must have a \"y\" key"); | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "width", sizeof("width") - 1)) != NULL) { | ||
| rect.width = zval_get_long(tmp); | ||
| r = zval_get_long(tmp); |
ext/gd/gd.c
Outdated
| } else { | ||
| zend_argument_value_error(2, "must have a \"width\" key"); | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "height", sizeof("height") - 1)) != NULL) { | ||
| rect.height = zval_get_long(tmp); | ||
| r = zval_get_long(tmp); |
devnexen
force-pushed
the
gd_to_try_get_long
branch
from
bea99f9 to
3233235
Compare
Girgias
approved these changes
Mar 11, 2025
| @@ -3822,6 +3848,22 @@ PHP_FUNCTION(imageantialias) | |||
| } | |||
| /* }}} */ | |||
|
|
|||
| static bool _php_gd_zval_try_get_c_int(zval *tmp, const char *field, int *res) { | |||
There was a problem hiding this comment.
Symbols starting with _ are reserved in C, so please avoid this.
Suggested change
| static bool _php_gd_zval_try_get_c_int(zval *tmp, const char *field, int *res) { | |
| static bool php_gd_zval_try_get_c_int(zval *tmp, const char *field, int *res) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.