Skip to content

ext/gmp: Fix GMP operator RHS overflow for GMP values #22656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LamentXU123 wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −10
Open

ext/gmp: Fix GMP operator RHS overflow for GMP values #22656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ PHP NEWS
- GMP:
. Fixed bug GH-22549 (Assertion failure / UB on a compound GMP power or shift
assignment with a negative exponent). (iliaal)
. Fixed GMP power and shift operators to reject GMP right operands outside
the unsigned long range instead of silently truncating them. (Weilin Du)

- Intl:
. Fixed NumberFormatter::parse() and NumberFormatter::parseCurrency() to
Expand Down
35 changes: 25 additions & 10 deletions ext/gmp/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,18 @@ static zend_result binop_operator_helper(gmp_binary_op_t gmp_op, zval *return_va

typedef void (*gmp_binary_ui_op_t)(mpz_ptr, mpz_srcptr, gmp_ulong);

static zend_result gmp_shift_operator_range_error(uint8_t opcode) {
zend_throw_error(
zend_ce_value_error, "%s must be between 0 and %lu",
opcode == ZEND_POW ? "Exponent" : "Shift", ULONG_MAX
);
return FAILURE;
}

static zend_result shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2, uint8_t opcode) {
zend_long shift = 0;
gmp_ulong shift_ui = 0;
bool have_shift_ui = false;

if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) {
if (UNEXPECTED(!IS_GMP(op2))) {
Expand All @@ -349,28 +359,33 @@ static zend_result shift_operator_helper(gmp_binary_ui_op_t op, zval *return_val
goto typeof_op_failure;
}
} else {
// TODO We shouldn't cast the GMP object to int here
shift = zval_get_long(op2);
mpz_ptr gmpnum_shift = GET_GMP_FROM_ZVAL(op2);
if (!mpz_fits_ulong_p(gmpnum_shift)) {
return gmp_shift_operator_range_error(opcode);
}
shift_ui = (gmp_ulong) mpz_get_ui(gmpnum_shift);
have_shift_ui = true;
}
} else {
shift = Z_LVAL_P(op2);
}

if (shift < 0 || shift > ULONG_MAX) {
zend_throw_error(
zend_ce_value_error, "%s must be between 0 and %lu",
opcode == ZEND_POW ? "Exponent" : "Shift", ULONG_MAX
);
return FAILURE;
} else {
if (!have_shift_ui) {
if (shift < 0 || shift > ULONG_MAX) {
return gmp_shift_operator_range_error(opcode);
}
shift_ui = (gmp_ulong) shift;
}

{
mpz_ptr gmpnum_op, gmpnum_result;

if (!gmp_zend_parse_arg_into_mpz_ex(op1, &gmpnum_op, 1, true)) {
goto typeof_op_failure;
}

INIT_GMP_RETVAL(gmpnum_result);
op(gmpnum_result, gmpnum_op, (gmp_ulong) shift);
op(gmpnum_result, gmpnum_op, shift_ui);
return SUCCESS;
}

Expand Down
26 changes: 26 additions & 0 deletions ext/gmp/tests/gmp_operator_rhs_gmp_overflow.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
GMP operator right operand rejects values outside the unsigned long range
--EXTENSIONS--
gmp
--FILE--
<?php
$too_large = gmp_init("18446744073709551616");

try {
var_dump(gmp_init(2) ** $too_large);
} catch (ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

try {
var_dump(gmp_init(2) << $too_large);
} catch (ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

echo "Done\n";
?>
--EXPECTF--
Exponent must be between 0 and %d
Shift must be between 0 and %d
Done
Loading