Skip to content

Commit 9b64d32

Browse files
committed
Revert "Fix GH-16322: overflow on imageaffine matrix argument."
This reverts commit 0511426, since it apparently has been pushed inadvertently (see PR #16334).
1 parent 0511426 commit 9b64d32

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

ext/gd/gd.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3687,25 +3687,13 @@ PHP_FUNCTION(imageaffine)
36873687
if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) {
36883688
switch (Z_TYPE_P(zval_affine_elem)) {
36893689
case IS_LONG:
3690-
affine[i] = Z_LVAL_P(zval_affine_elem);
3691-
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
3692-
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
3693-
RETURN_THROWS();
3694-
}
3690+
affine[i] = Z_LVAL_P(zval_affine_elem);
36953691
break;
36963692
case IS_DOUBLE:
36973693
affine[i] = Z_DVAL_P(zval_affine_elem);
3698-
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
3699-
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
3700-
RETURN_THROWS();
3701-
}
37023694
break;
37033695
case IS_STRING:
37043696
affine[i] = zval_get_double(zval_affine_elem);
3705-
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
3706-
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
3707-
RETURN_THROWS();
3708-
}
37093697
break;
37103698
default:
37113699
zend_argument_type_error(3, "contains invalid type for element %i", i);

0 commit comments

Comments
 (0)