From 8194595ec959fe792caca919dcbe32cc8eeedbe3 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 19 Jan 2018 16:56:21 -0500
Subject: [PATCH] Handle 3.6+ EXTENDED_ARGs for POP_JUMP_IF... instructions

---
 test/bytecode_3.6/10_long_pop_jump.pyc       | Bin 0 -> 1135 bytes
 test/simple_source/bug36/10_long_pop_jump.py |  50 +++++++++++++++++++
 uncompyle6/scanners/scanner3.py              |   6 ++-
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.6/10_long_pop_jump.pyc
 create mode 100644 test/simple_source/bug36/10_long_pop_jump.py

diff --git a/test/bytecode_3.6/10_long_pop_jump.pyc b/test/bytecode_3.6/10_long_pop_jump.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d32e717a3ed1c6150b5932677b158698dfc2dfe4
GIT binary patch
literal 1135
zcmZ8gPjAyO6!&w}HcdO|M#qEzsUTqL0md{5B!ng;B#sD)15!YQEH+!##0j>e{ZYD0
z;et3!d<(t<pMekHE2nYh)C)W(6%-u#`T6~Re((3}c57+L+lY7k%@!fw$-<!MKf<Yc
zXc%Gep7?~(=Va7~EM`XsXA|dRoa!?WqDe_h`hi{|Y-QY%19ss#(V)o`CXE_n&Kjw3
z7*qM6B>S|4DIg0^;;AM^pJB97N6~XIBTVTlI&mhLo3+M7CMD`99o9znF{333nx}Bs
zM`mM8PC<UEvrU?1lex(GhI_D;Yi*O({OniE-zr;E03tl}+qI8X8fyeAG+AfdIwkU_
zc5TKfowUog`oRW>wf8$yGNIxlvOHvg?Ej<IMNE{aOAc+m`<D9}x!57bl3D?JPw<pi
zSG0X1>jq-0RmL}nb=mpSxrjG7*VtwK%3rCl<+{@vpWn`jy`6U_F9^GcueJ7c2Dc44
z!`C5a_Tgsm@(dSZfX!fg2I~ew(+;&xVx^6n#A2+Ea&8>!nKn;&%7s3@RR~q&c_uYy
z!}XWz!)Py*!&nS&sv+Z163S4=nK-^)2!5FJ=zrQG=h_12ru>s>fij}f3YJ#z*)JUO
zJbK%XjV)QzwdR~P_V-z#qn_WE;Q<SEXc`F@{!$)F#e*nIZ3q6K-lm}(a~3F+h<bf5
zP*ErX5vJVl2UbFm={+uOd&=+bg@Pr#iu=7nj74@J>fNAPl$NpBO=2CSp^o-UgA3-b
z26ZWxMfNHKRqQCPO_NKR$x+8RiYIRk#0K^a2;a3;t2>9tIF)`#jbkN!A@VZzH(OV6
znxhVt6*A%*JH_tSy^YPgL6V8xAkXq(zew{t`H@+kSN{7V_{S#d85#n8aKMEDc+dln
z_R+Wd7Mw%tBI-hqdT2fT9Q^FMg1B9+=Ru$Ls59rwtC;iY2&%P`xnQm!X55Eq#)^b*
IR~oE@-yl~g<p2Nx

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/10_long_pop_jump.py b/test/simple_source/bug36/10_long_pop_jump.py
new file mode 100644
index 00000000..ad6c4de7
--- /dev/null
+++ b/test/simple_source/bug36/10_long_pop_jump.py
@@ -0,0 +1,50 @@
+# From 3.6 _markupbase.py
+
+# Bug is that the routine is long enough that POP_JUMP_IF_FALSE instruciton has an
+# EXTENDED_ARG intruction before it and we weren't picking out the jump offset properly
+
+def parse_declaration(self, i):
+    if rawdata[j:j] in ("-", ""):
+        return -1
+    n = len(rawdata)
+    if rawdata[j:j+2] == '-':
+        return self.parse_comment(i)
+    elif rawdata[j] == '[':
+        return self.parse_marked_section(i)
+    else:
+        decltype, j = self._scan_name(j, i)
+    if j < 0:
+        return j
+    if decltype == "d":
+        self._decl_otherchars = ''
+    while j < n:
+        c = rawdata[j]
+        if c == ">":
+            data = rawdata[i+2:j]
+            if decltype == "d":
+                self.handle_decl(data)
+            else:
+                self.unknown_decl(data)
+            return j + 1
+        if c in "'":
+            m = _declstringlit_match(rawdata, j)
+            if not m:
+                return -1
+            j = m.end()
+        elif c in "a":
+            name, j = self._scan_name(j, i)
+        elif c:
+            j += 1
+        elif c == "[":
+            if decltype == "d":
+                j = self._parse_doctype_subset(j + 1, i)
+            elif decltype in {"attlist", "linktype", "link", "element"}:
+                self.error("unsupported '[' char in %s declaration" % decltype)
+            else:
+                self.error("unexpected '[' char in declaration")
+        else:
+            self.error(
+                "unexpected %r char in declaration" % rawdata[j])
+        if j < 0:
+            return j
+    return -1
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index a15950fb..b822e70d 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -716,6 +716,8 @@ class Scanner3(Scanner):
             else:
                 if self.get_target(jump_back, 0) >= next_line_byte:
                     jump_back = self.last_instr(start, end, self.opc.JUMP_ABSOLUTE, start, False)
+
+                # This is wrong for 3.6+
                 if end > jump_back+4 and self.is_jump_forward(end):
                     if self.is_jump_forward(jump_back+4):
                         if self.get_target(jump_back+4) == self.get_target(end):
@@ -753,8 +755,8 @@ class Scanner3(Scanner):
                                      'start': after_jump_offset,
                                      'end':   end})
         elif op in self.pop_jump_tf:
-            start = offset + instruction_size(op, self.opc)
-            target = self.get_target(offset)
+            start   = offset + instruction_size(op, self.opc)
+            target  = self.insts[inst_index].argval
             rtarget = self.restrict_to_parent(target, parent)
             prev_op = self.prev_op