mirror of
https://github.com/micropython/micropython.git
synced 2025-07-21 21:11:12 +02:00
py/mpz: Avoid undefined behavior decrementing NULL.
In the case where an mpz number is zero, its `len` is 0 and its `dig` is NULL. In that case, decrementing NULL via `d--` is undefined behavior according to the C specification. Restructuring the loops in this way avoids undefined behavior. Also, ensure that these cases are tested in the coverage test. This doesn't make much difference now, but would otherwise cause errors later when the undefined behavior sanitizer is employed in CI. Signed-off-by: Jeff Epler <jepler@gmail.com>
This commit is contained in:
committed by
Damien George
parent
42404b5588
commit
0ef5ede382
@@ -475,6 +475,18 @@ static mp_obj_t extra_coverage(void) {
|
||||
mp_int_t value_signed;
|
||||
mpz_as_int_checked(&mpz, &value_signed);
|
||||
mp_printf(&mp_plat_print, "%d\n", (int)value_signed);
|
||||
|
||||
// hash the zero mpz integer
|
||||
mpz_set_from_int(&mpz, 0);
|
||||
mp_printf(&mp_plat_print, "%d\n", mpz_hash(&mpz));
|
||||
|
||||
// convert the mpz zero integer to int
|
||||
mp_printf(&mp_plat_print, "%d\n", mpz_as_int_checked(&mpz, &value_signed));
|
||||
mp_printf(&mp_plat_print, "%d\n", value_signed);
|
||||
|
||||
// mpz_set_from_float with 0 as argument
|
||||
mpz_set_from_float(&mpz, 0);
|
||||
mp_printf(&mp_plat_print, "%f\n", mpz_as_float(&mpz));
|
||||
}
|
||||
|
||||
// runtime utils
|
||||
|
12
py/mpz.c
12
py/mpz.c
@@ -1537,7 +1537,8 @@ mp_int_t mpz_hash(const mpz_t *z) {
|
||||
mp_uint_t val = 0;
|
||||
mpz_dig_t *d = z->dig + z->len;
|
||||
|
||||
while (d-- > z->dig) {
|
||||
while (d > z->dig) {
|
||||
d--;
|
||||
val = (val << DIG_SIZE) | *d;
|
||||
}
|
||||
|
||||
@@ -1552,11 +1553,12 @@ bool mpz_as_int_checked(const mpz_t *i, mp_int_t *value) {
|
||||
mp_uint_t val = 0;
|
||||
mpz_dig_t *d = i->dig + i->len;
|
||||
|
||||
while (d-- > i->dig) {
|
||||
while (d > i->dig) {
|
||||
if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> DIG_SIZE)) {
|
||||
// will overflow
|
||||
return false;
|
||||
}
|
||||
d--;
|
||||
val = (val << DIG_SIZE) | *d;
|
||||
}
|
||||
|
||||
@@ -1577,11 +1579,12 @@ bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
|
||||
mp_uint_t val = 0;
|
||||
mpz_dig_t *d = i->dig + i->len;
|
||||
|
||||
while (d-- > i->dig) {
|
||||
while (d > i->dig) {
|
||||
if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> (DIG_SIZE - 1))) {
|
||||
// will overflow
|
||||
return false;
|
||||
}
|
||||
d--;
|
||||
val = (val << DIG_SIZE) | *d;
|
||||
}
|
||||
|
||||
@@ -1642,7 +1645,8 @@ mp_float_t mpz_as_float(const mpz_t *i) {
|
||||
mp_float_t val = 0;
|
||||
mpz_dig_t *d = i->dig + i->len;
|
||||
|
||||
while (d-- > i->dig) {
|
||||
while (d > i->dig) {
|
||||
d--;
|
||||
val = val * DIG_BASE + *d;
|
||||
}
|
||||
|
||||
|
@@ -89,6 +89,10 @@ data
|
||||
12345
|
||||
6
|
||||
-1
|
||||
0
|
||||
1
|
||||
0
|
||||
0.000000
|
||||
# runtime utils
|
||||
TypeError: unsupported type for __abs__: 'str'
|
||||
TypeError: unsupported types for __divmod__: 'str', 'str'
|
||||
|
Reference in New Issue
Block a user