Merge pull request SHA2017-badge#190 from SHA2017-badge/basvs-fix-pack-8byte-bigendian

raboof · web-flow · commit 8096b30c27d4 · 2017-08-05T07:26:04.000-07:00
fix big-endian packing to 8 bytes
diff --git a/py/binary.c b/py/binary.c
@@ -303,7 +303,12 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **
                 // zero/sign extend if needed
                 if (BYTES_PER_WORD < 8 && size > sizeof(val)) {
                     int c = (is_signed(val_type) && (mp_int_t)val < 0) ? 0xff : 0x00;
-                    memset(p + sizeof(val), c, size - sizeof(val));
+                    if (struct_type == '>') {
+                        memset(p, c, size - sizeof(val));
+                        p += size - sizeof(val);
+                    } else {
+                        memset(p + sizeof(val), c, size - sizeof(val));
+                    }
                 }
             }
     }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,12 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **`
`303`	`303`	`// zero/sign extend if needed`
`304`	`304`	`if (BYTES_PER_WORD < 8 && size > sizeof(val)) {`
`305`	`305`	`int c = (is_signed(val_type) && (mp_int_t)val < 0) ? 0xff : 0x00;`
`306`		`- memset(p + sizeof(val), c, size - sizeof(val));`
	`306`	`+ if (struct_type == '>') {`
	`307`	`+ memset(p, c, size - sizeof(val));`
	`308`	`+ p += size - sizeof(val);`
	`309`	`+ } else {`
	`310`	`+ memset(p + sizeof(val), c, size - sizeof(val));`
	`311`	`+ }`
`307`	`312`	`}`
`308`	`313`	`}`
`309`	`314`	`}`