Revert "Fix GH-16322: overflow on imageaffine matrix argument."

This reverts commit 05114265fb.
This commit is contained in:
David Carlier 2024-10-09 23:57:09 +01:00
parent 05114265fb
commit 93a2fe8aac
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1

View file

@ -3687,25 +3687,13 @@ PHP_FUNCTION(imageaffine)
if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) {
switch (Z_TYPE_P(zval_affine_elem)) {
case IS_LONG:
affine[i] = Z_LVAL_P(zval_affine_elem);
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
RETURN_THROWS();
}
affine[i] = Z_LVAL_P(zval_affine_elem);
break;
case IS_DOUBLE:
affine[i] = Z_DVAL_P(zval_affine_elem);
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
RETURN_THROWS();
}
break;
case IS_STRING:
affine[i] = zval_get_double(zval_affine_elem);
if (ZEND_LONG_EXCEEDS_INT(affine[i])) {
zend_argument_type_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
RETURN_THROWS();
}
break;
default:
zend_argument_type_error(3, "contains invalid type for element %i", i);