py/modstruct: In struct.pack, stop converting if there are no args left.

dpgeorge · dpgeorge · commit 793d826d9df6 · 2017-09-01T10:10:51.000+10:00
This patch makes a repeat counter behave the same as repeating the
typecode, when there are not enough args.  For example:
struct.pack('2I', 1) now behave the same as struct.pack('II', 1).
diff --git a/py/modstruct.c b/py/modstruct.c
@@ -206,7 +206,8 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, byte* end_p, siz
             memset(p + to_copy, 0, sz - to_copy);
             p += sz;
         } else {
-            while (sz--) {
+            // If we run out of args then we just finish; CPython would raise struct.error
+            while (sz-- && i < n_args) {
                 mp_binary_set_val(fmt_type, *fmt, args[i++], &p);
             }
         }
diff --git a/tests/basics/struct_micropython.py b/tests/basics/struct_micropython.py
@@ -18,6 +18,9 @@ class A():
 o2 = struct.unpack("<O", s)
 print(o is o2[0])
 
+# pack can accept less arguments than required for the format spec
+print(struct.pack('<2I', 1))
+
 # pack and unpack pointer to a string
 # This requires uctypes to get the address of the string and instead of
 # putting this in a dedicated test that can be skipped we simply pass
diff --git a/tests/basics/struct_micropython.py.exp b/tests/basics/struct_micropython.py.exp
@@ -1 +1,2 @@
 True
+b'\x01\x00\x00\x00\x00\x00\x00\x00'

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte p, byte end_p, siz`
`206`	`206`	`memset(p + to_copy, 0, sz - to_copy);`
`207`	`207`	`p += sz;`
`208`	`208`	`} else {`
`209`		`- while (sz--) {`
	`209`	`+ // If we run out of args then we just finish; CPython would raise struct.error`
	`210`	`+ while (sz-- && i < n_args) {`
`210`	`211`	`mp_binary_set_val(fmt_type, *fmt, args[i++], &p);`
`211`	`212`	`}`
`212`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`True`
	`2`	`+b'\x01\x00\x00\x00\x00\x00\x00\x00'`