From b29fae0c564bae271f3659563a2a61230dab5def Mon Sep 17 00:00:00 2001
From: Damien George
Date: Mon, 2 Sep 2019 13:30:16 +1000
Subject: py/bc: Fix size calculation of UNWIND_JUMP opcode in
 mp_opcode_format.

Prior to this patch mp_opcode_format would calculate the incorrect size of
the MP_BC_UNWIND_JUMP opcode, missing the additional byte.  But, because
opcodes below 0x10 are unused and treated as bytes in the .mpy load/save
and freezing code, this bug did not show any symptoms, since nested unwind
jumps would rarely (if ever) reach a depth of 16 (so the extra byte of this
opcode would be between 0x01 and 0x0f and be correctly loaded/saved/frozen
simply as an undefined opcode).

This patch fixes this bug by correctly accounting for the additional byte.
        .
---
 tools/mpy-tool.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 3d2a8fb7c..e5c8f0959 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -109,6 +109,7 @@ MP_OPCODE_VAR_UINT = 2
 MP_OPCODE_OFFSET = 3
 
 # extra bytes:
+MP_BC_UNWIND_JUMP = 0x46
 MP_BC_MAKE_CLOSURE = 0x62
 MP_BC_MAKE_CLOSURE_DEFARGS = 0x63
 MP_BC_RAISE_VARARGS = 0x5c
@@ -215,7 +216,8 @@ def mp_opcode_format(bytecode, ip, count_var_uint, opcode_format=make_opcode_for
         ip += 3
     else:
         extra_byte = (
-            opcode == MP_BC_RAISE_VARARGS
+            opcode == MP_BC_UNWIND_JUMP
+            or opcode == MP_BC_RAISE_VARARGS
             or opcode == MP_BC_MAKE_CLOSURE
             or opcode == MP_BC_MAKE_CLOSURE_DEFARGS
         )
-- 
cgit v1.2.3