[swfinterp] Implement bitand and pushshort operators
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 17 Nov 2014 04:08:39 +0000 (05:08 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 17 Nov 2014 04:08:39 +0000 (05:08 +0100)
youtube_dl/swfinterp.py

index 7369c94fcacc78674ab297a48087678b510b4440..fc704603ab233353bf488e01c45cb9a8f14c4b5e 100644 (file)
@@ -451,6 +451,9 @@ class SWFInterpreter(object):
                 elif opcode == 36:  # pushbyte
                     v = _read_byte(coder)
                     stack.append(v)
+                elif opcode == 37:  # pushshort
+                    v = u30()
+                    stack.append(v)
                 elif opcode == 38:  # pushtrue
                     stack.append(True)
                 elif opcode == 39:  # pushfalse
@@ -712,6 +715,13 @@ class SWFInterpreter(object):
                     value1 = stack.pop()
                     res = value1 % value2
                     stack.append(res)
+                elif opcode == 168:  # bitand
+                    value2 = stack.pop()
+                    value1 = stack.pop()
+                    assert isinstance(value1, int)
+                    assert isinstance(value2, int)
+                    res = value1 & value2
+                    stack.append(res)
                 elif opcode == 171:  # equals
                     value2 = stack.pop()
                     value1 = stack.pop()