TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/modstruct: Fix struct.unpack with unaligned offset of native type.

Browse Source 
With this patch alignment is done relative to the start of the buffer that
is being unpacked, not the raw pointer value, as per CPython.

Fixes issue #3314.
This commit is contained in:
Tom McDermott
2019-08-05 15:15:28 +10:00
committed by Damien George
parent 12f13ee634
commit 1022f9cc35
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/binary.c
View File

@@ -185,14 +185,14 @@ long long mp_binary_get_int(mp_uint_t size, bool is_signed, bool big_endian, con
}
#define is_signed(typecode) (typecode > 'Z')
mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr) {
mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte **ptr) {
byte *p = *ptr;
mp_uint_t align;
size_t size = mp_binary_get_size(struct_type, val_type, &align);
if (struct_type == '@') {
// Make pointer aligned
p = (byte*)MP_ALIGN(p, (size_t)align);
// Align p relative to p_base
p = p_base + (uintptr_t)MP_ALIGN(p - p_base, (size_t)align);
#if MP_ENDIANNESS_LITTLE
struct_type = '<';
#else