depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-21 09:41:50 +00:00
Code Issues Releases Wiki Activity

[swfinterp] Add support for void methods

Browse source
This commit is contained in:
Philipp Hagemeister 2014-11-17 04:36:23 +01:00
parent a4bb83956c
commit 8d05f2c16a
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/swftests/PrivateVoidCall.as Normal file
View file

@ -0,0 +1,22 @@
// input: []
// output: 9
package {
public class PrivateVoidCall {
public static function main():int{
var f:OtherClass = new OtherClass();
f.func();
return 9;
}
}
}
class OtherClass {
private function pf():void {
;
}
public function func():void {
this.pf();
}
}

17
youtube_dl/swfinterp.py
View file

@ -504,6 +504,9 @@ class SWFInterpreter(object):
raise NotImplementedError(
'Unsupported property %r on %r'
% (mname, obj))
elif opcode == 71: # returnvoid
res = None
return res
elif opcode == 72: # returnvalue
res = stack.pop()
return res
@ -527,6 +530,17 @@ class SWFInterpreter(object):
args = list(reversed(
[stack.pop() for _ in range(arg_count)]))
obj = stack.pop()
if isinstance(obj, _AVMClass_Object):
func = self.extract_function(obj.avm_class, mname)
res = func(args)
assert res is None
continue
if isinstance(obj, _ScopeDict):
assert mname in obj.avm_class.method_names
func = self.extract_function(obj.avm_class, mname)
res = func(args)
assert res is None
continue
if mname == 'reverse':
assert isinstance(obj, list)
obj.reverse()
@ -603,7 +617,8 @@ class SWFInterpreter(object):
obj = stack.pop()
assert isinstance(obj, (dict, _ScopeDict)), \
'Accessing member %r on %r' % (pname, obj)
stack.append(obj[pname])
res = obj.get(pname, None)
stack.append(res)
else: # Assume attribute access
idx = stack.pop()
assert isinstance(idx, int)