ext/gd: calls with array types check strengthening. #18005
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
ext/gd/gd.c
Outdated
| @@ -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) { |
There was a problem hiding this comment.
sorry just saw your comment now, agreed.
devnexen
force-pushed
the
gd_to_try_get_long
branch
2 times, most recently
from
3645a3c to
f54c5f3
Compare
Girgias
requested changes
Mar 30, 2025
ext/gd/gd.c
Outdated
| zend_long tmp = zval_try_get_long(item, &failed); | ||
| if (failed) { | ||
| efree(stylearr); | ||
| zend_argument_value_error(2, "value must be of type int, %s given", zend_zval_type_name(item)); |
There was a problem hiding this comment.
Should be a type error? And maybe clarify that its the elements of the style array?
| zend_long tmp = zval_try_get_long(color, &failed); | ||
| if (failed) { | ||
| efree(colors); | ||
| zend_argument_value_error(5, "value must be of type int, %s given", zend_zval_type_name(color)); |
There was a problem hiding this comment.
Ditto type error and clarify value of the hash colors array
ext/gd/tests/gh18005.phpt
Outdated
| echo $e->getMessage() . PHP_EOL; | ||
| } | ||
| try { | ||
| imagefilter($img, IMG_FILTER_SCATTER, 0, 0, array(new A())); |
There was a problem hiding this comment.
Use [] instead of array() (especially as the prior 2 use the short syntax)
devnexen
force-pushed
the
gd_to_try_get_long
branch
from
f54c5f3 to
32c5b78
Compare
nielsdos
reviewed
Mar 30, 2025
devnexen
force-pushed
the
gd_to_try_get_long
branch
from
3c3a228 to
c6bae19
Compare
nielsdos
reviewed
Mar 31, 2025
ext/gd/gd.c
Outdated
| zend_long tmp = zval_try_get_long(item, &failed); | ||
| if (failed) { | ||
| efree(stylearr); | ||
| zend_argument_type_error(2, "must only have element of type int, %s given", zend_zval_type_name(item)); |
There was a problem hiding this comment.
Suggested change
| zend_argument_type_error(2, "must only have element of type int, %s given", zend_zval_type_name(item)); | |
| zend_argument_type_error(2, "must only have elements of type int, %s given", zend_zval_type_name(item)); |
ext/gd/gd.c
Outdated
| } | ||
| if (ZEND_LONG_EXCEEDS_INT(tmp)) { | ||
| efree(stylearr); | ||
| zend_argument_type_error(2, "must have element between %d and %d", INT_MIN, INT_MAX); |
There was a problem hiding this comment.
The wording could be improved here too IMO
| zend_long tmp = zval_try_get_long(color, &failed); | ||
| if (failed) { | ||
| efree(colors); | ||
| zend_argument_value_error(5, "value must be of type int, %s given", zend_zval_type_name(color)); |
devnexen
force-pushed
the
gd_to_try_get_long
branch
from
0e94dd5 to
d8c30cf
Compare
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.