Fix py version of struct too.

tannewt · tannewt · commit 6620ac8becd5 · 2021-04-19T14:59:40.000-07:00
diff --git a/py/modstruct.c b/py/modstruct.c
@@ -214,9 +214,11 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, c
             p += cnt;
         } else {
             while (cnt--) {
-                mp_binary_set_val(fmt_type, *fmt, args[i], &p);
                 // Pad bytes don't have a corresponding argument.
-                if (*fmt != 'x') {
+                if (*fmt == 'x') {
+                    mp_binary_set_val(fmt_type, *fmt, MP_OBJ_NEW_SMALL_INT(0), &p);
+                } else {
+                    mp_binary_set_val(fmt_type, *fmt, args[i], &p);
                     i++;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,11 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, size_t n_args, c`
`214`	`214`	`p += cnt;`
`215`	`215`	`} else {`
`216`	`216`	`while (cnt--) {`
`217`		`- mp_binary_set_val(fmt_type, *fmt, args[i], &p);`
`218`	`217`	`// Pad bytes don't have a corresponding argument.`
`219`		`- if (*fmt != 'x') {`
	`218`	`+ if (*fmt == 'x') {`
	`219`	`+ mp_binary_set_val(fmt_type, *fmt, MP_OBJ_NEW_SMALL_INT(0), &p);`
	`220`	`+ } else {`
	`221`	`+ mp_binary_set_val(fmt_type, *fmt, args[i], &p);`
`220`	`222`	`i++;`
`221`	`223`	`}`
`222`	`224`	`}`