djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Fix handling of negative numbers in struct.pack of q/Q.

This commit is contained in:
Damien George 2015-04-25 23:51:14 +01:00
parent ae2c81ff38
commit 9472907ae1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/binary.c
View File

@ -291,6 +291,10 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **
#endif
{
val = mp_obj_get_int(val_in);
// sign extend if needed
if (BYTES_PER_WORD < 8 && size > sizeof(val) && is_signed(val_type) && (mp_int_t)val < 0) {
memset(p + sizeof(val), 0xff, size - sizeof(val));
}
}
}

4
py/mpz.c
View File

@ -1441,8 +1441,8 @@ void mpz_as_bytes(const mpz_t *z, bool big_endian, mp_uint_t len, byte *buf) {
for (; bits >= 8; bits -= 8, d >>= 8) {
mpz_dig_t val = d;
if (z->neg) {
d = (~d & 0xff) + carry;
carry = d >> 8;
val = (~val & 0xff) + carry;
carry = val >> 8;
}
if (big_endian) {
*--b = val;