projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/generic] Add support for ISM manifests
[youtube-dl]
/
youtube_dl
/
swfinterp.py
diff --git
a/youtube_dl/swfinterp.py
b/youtube_dl/swfinterp.py
index e9bf178e43ede03c182f517ba5593b83d6564ba2..7cf490aa43a878b3c377bea0b173c7a2b170c2c7 100644
(file)
--- a/
youtube_dl/swfinterp.py
+++ b/
youtube_dl/swfinterp.py
@@
-4,10
+4,12
@@
import collections
import io
import zlib
import io
import zlib
-from .
utils
import (
+from .
compat
import (
compat_str,
compat_str,
+ compat_struct_unpack,
+)
+from .utils import (
ExtractorError,
ExtractorError,
- struct_unpack,
)
)
@@
-23,17
+25,17
@@
def _extract_tags(file_contents):
file_contents[:1])
# Determine number of bits in framesize rectangle
file_contents[:1])
# Determine number of bits in framesize rectangle
- framesize_nbits = struct_unpack('!B', content[:1])[0] >> 3
+ framesize_nbits =
compat_
struct_unpack('!B', content[:1])[0] >> 3
framesize_len = (5 + 4 * framesize_nbits + 7) // 8
pos = framesize_len + 2 + 2
while pos < len(content):
framesize_len = (5 + 4 * framesize_nbits + 7) // 8
pos = framesize_len + 2 + 2
while pos < len(content):
- header16 = struct_unpack('<H', content[pos:pos + 2])[0]
+ header16 =
compat_
struct_unpack('<H', content[pos:pos + 2])[0]
pos += 2
tag_code = header16 >> 6
tag_len = header16 & 0x3f
if tag_len == 0x3f:
pos += 2
tag_code = header16 >> 6
tag_len = header16 & 0x3f
if tag_len == 0x3f:
- tag_len = struct_unpack('<I', content[pos:pos + 4])[0]
+ tag_len =
compat_
struct_unpack('<I', content[pos:pos + 4])[0]
pos += 4
assert pos + tag_len <= len(content), \
('Tag %d ends at %d+%d - that\'s longer than the file (%d)'
pos += 4
assert pos + tag_len <= len(content), \
('Tag %d ends at %d+%d - that\'s longer than the file (%d)'
@@
-62,13
+64,14
@@
class _ScopeDict(dict):
class _AVMClass(object):
class _AVMClass(object):
- def __init__(self, name_idx, name):
+ def __init__(self, name_idx, name
, static_properties=None
):
self.name_idx = name_idx
self.name = name
self.method_names = {}
self.method_idxs = {}
self.methods = {}
self.method_pyfunctions = {}
self.name_idx = name_idx
self.name = name
self.method_names = {}
self.method_idxs = {}
self.methods = {}
self.method_pyfunctions = {}
+ self.static_properties = static_properties if static_properties else {}
self.variables = _ScopeDict(self)
self.constants = {}
self.variables = _ScopeDict(self)
self.constants = {}
@@
-100,7
+103,7
@@
def _read_int(reader):
for _ in range(5):
buf = reader.read(1)
assert len(buf) == 1
for _ in range(5):
buf = reader.read(1)
assert len(buf) == 1
- b = struct_unpack('<B', buf)[0]
+ b =
compat_
struct_unpack('<B', buf)[0]
res = res | ((b & 0x7f) << shift)
if b & 0x80 == 0:
break
res = res | ((b & 0x7f) << shift)
if b & 0x80 == 0:
break
@@
-126,7
+129,7
@@
def _s24(reader):
bs = reader.read(3)
assert len(bs) == 3
last_byte = b'\xff' if (ord(bs[2:3]) >= 0x80) else b'\x00'
bs = reader.read(3)
assert len(bs) == 3
last_byte = b'\xff' if (ord(bs[2:3]) >= 0x80) else b'\x00'
- return struct_unpack('<i', bs + last_byte)[0]
+ return
compat_
struct_unpack('<i', bs + last_byte)[0]
def _read_string(reader):
def _read_string(reader):
@@
-145,31
+148,42
@@
def _read_bytes(count, reader):
def _read_byte(reader):
resb = _read_bytes(1, reader=reader)
def _read_byte(reader):
resb = _read_bytes(1, reader=reader)
- res = struct_unpack('<B', resb)[0]
+ res =
compat_
struct_unpack('<B', resb)[0]
return res
StringClass = _AVMClass('(no name idx)', 'String')
ByteArrayClass = _AVMClass('(no name idx)', 'ByteArray')
return res
StringClass = _AVMClass('(no name idx)', 'String')
ByteArrayClass = _AVMClass('(no name idx)', 'ByteArray')
+TimerClass = _AVMClass('(no name idx)', 'Timer')
+TimerEventClass = _AVMClass('(no name idx)', 'TimerEvent', {'TIMER': 'timer'})
_builtin_classes = {
StringClass.name: StringClass,
ByteArrayClass.name: ByteArrayClass,
_builtin_classes = {
StringClass.name: StringClass,
ByteArrayClass.name: ByteArrayClass,
+ TimerClass.name: TimerClass,
+ TimerEventClass.name: TimerEventClass,
}
class _Undefined(object):
}
class _Undefined(object):
- def __bool
ean
__(self):
+ def __bool__(self):
return False
return False
+ __nonzero__ = __bool__
def __hash__(self):
return 0
def __hash__(self):
return 0
+ def __str__(self):
+ return 'undefined'
+ __repr__ = __str__
+
undefined = _Undefined()
class SWFInterpreter(object):
def __init__(self, file_contents):
undefined = _Undefined()
class SWFInterpreter(object):
def __init__(self, file_contents):
- self._patched_functions = {}
+ self._patched_functions = {
+ (TimerClass, 'addEventListener'): lambda params: undefined,
+ }
code_tag = next(tag
for tag_code, tag in _extract_tags(file_contents)
if tag_code == 82)
code_tag = next(tag
for tag_code, tag in _extract_tags(file_contents)
if tag_code == 82)
@@
-346,9
+360,10
@@
class SWFInterpreter(object):
u30() # iinit
trait_count = u30()
for _c2 in range(trait_count):
u30() # iinit
trait_count = u30()
for _c2 in range(trait_count):
- trait_methods, constants = parse_traits_info()
+ trait_methods,
trait_
constants = parse_traits_info()
avm_class.register_methods(trait_methods)
avm_class.register_methods(trait_methods)
- assert constants is None
+ if trait_constants:
+ avm_class.constants.update(trait_constants)
assert len(classes) == class_count
self._classes_by_name = dict((c.name, c) for c in classes)
assert len(classes) == class_count
self._classes_by_name = dict((c.name, c) for c in classes)
@@
-439,7
+454,7
@@
class SWFInterpreter(object):
registers = [avm_class.variables] + list(args) + [None] * m.local_count
stack = []
scopes = collections.deque([
registers = [avm_class.variables] + list(args) + [None] * m.local_count
stack = []
scopes = collections.deque([
- self._classes_by_name, avm_class.variables])
+ self._classes_by_name, avm_class.
constants, avm_class.
variables])
while True:
opcode = _read_byte(coder)
if opcode == 9: # label
while True:
opcode = _read_byte(coder)
if opcode == 9: # label
@@
-587,6
+602,12
@@
class SWFInterpreter(object):
elif opcode == 72: # returnvalue
res = stack.pop()
return res
elif opcode == 72: # returnvalue
res = stack.pop()
return res
+ elif opcode == 73: # constructsuper
+ # Not yet implemented, just hope it works without it
+ arg_count = u30()
+ args = list(reversed(
+ [stack.pop() for _ in range(arg_count)]))
+ obj = stack.pop()
elif opcode == 74: # constructproperty
index = u30()
arg_count = u30()
elif opcode == 74: # constructproperty
index = u30()
arg_count = u30()
@@
-667,8
+688,12
@@
class SWFInterpreter(object):
if mname in scope:
res = scope[mname]
if mname in scope:
res = scope[mname]
+ elif mname in _builtin_classes:
+ res = _builtin_classes[mname]
else:
else:
- res = avm_class.constants[mname]
+ # Assume uninitialized
+ # TODO warn here
+ res = undefined
stack.append(res)
elif opcode == 97: # setproperty
index = u30()
stack.append(res)
elif opcode == 97: # setproperty
index = u30()
@@
-694,7
+719,12
@@
class SWFInterpreter(object):
stack.append(len(obj))
elif isinstance(pname, compat_str): # Member access
obj = stack.pop()
stack.append(len(obj))
elif isinstance(pname, compat_str): # Member access
obj = stack.pop()
- assert isinstance(obj, (dict, _ScopeDict)), \
+ if isinstance(obj, _AVMClass):
+ res = obj.static_properties[pname]
+ stack.append(res)
+ continue
+
+ assert isinstance(obj, (dict, _ScopeDict)),\
'Accessing member %r on %r' % (pname, obj)
res = obj.get(pname, undefined)
stack.append(res)
'Accessing member %r on %r' % (pname, obj)
res = obj.get(pname, undefined)
stack.append(res)
@@
-799,4
+829,3
@@
class SWFInterpreter(object):
avm_class.method_pyfunctions[func_name] = resfunc
return resfunc
avm_class.method_pyfunctions[func_name] = resfunc
return resfunc
-