projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch codebase to use sanitized_Request instead of
[youtube-dl]
/
youtube_dl
/
swfinterp.py
diff --git
a/youtube_dl/swfinterp.py
b/youtube_dl/swfinterp.py
index e9bf178e43ede03c182f517ba5593b83d6564ba2..e60505ace8b8451666f2aeebea3277bc58cb6297 100644
(file)
--- a/
youtube_dl/swfinterp.py
+++ b/
youtube_dl/swfinterp.py
@@
-4,8
+4,8
@@
import collections
import io
import zlib
import io
import zlib
+from .compat import compat_str
from .utils import (
from .utils import (
- compat_str,
ExtractorError,
struct_unpack,
)
ExtractorError,
struct_unpack,
)
@@
-62,13
+62,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 = {}
@@
-151,25
+152,36
@@
def _read_byte(reader):
StringClass = _AVMClass('(no name idx)', 'String')
ByteArrayClass = _AVMClass('(no name idx)', 'ByteArray')
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
+358,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
+452,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
+600,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
+686,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 unitialized
+ # 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
+717,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
+827,3
@@
class SWFInterpreter(object):
avm_class.method_pyfunctions[func_name] = resfunc
return resfunc
avm_class.method_pyfunctions[func_name] = resfunc
return resfunc
-