From dffa383b062b0dd788abed0af242b66bde910e6b Mon Sep 17 00:00:00 2001 From: Damien George <damien.p.george@gmail.com> Date: Fri, 7 Oct 2016 12:54:14 +1100 Subject: [PATCH] py/modstruct: Remove unreachable code, and add comment about CPy diff. The deleted code is unreachable because calcsize_items guarantees that num_items corresponds to how many items there are in fmt to unpack. --- py/modstruct.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/py/modstruct.c b/py/modstruct.c index 5c07b8102..88411ff0f 100644 --- a/py/modstruct.c +++ b/py/modstruct.c @@ -156,9 +156,6 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *args) { } for (uint i = 0; i < num_items;) { - if (*fmt == '\0') { - break; - } mp_uint_t sz = 1; if (unichar_isdigit(*fmt)) { sz = get_fmt_num(&fmt); @@ -191,6 +188,7 @@ STATIC void struct_pack_into_internal(mp_obj_t fmt_in, byte *p, byte* end_p, siz for (i = 0; i < n_args;) { mp_uint_t sz = 1; if (*fmt == '\0') { + // more arguments given than used by format string; CPython raises struct.error here break; } if (unichar_isdigit(*fmt)) { -- GitLab