R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[jsinterp] Adding in_string state to extract_arguments

Browse Source
This commit is contained in:
sulyi 2016-11-21 11:33:57 +01:00
parent d13093bed3
commit cc17865bc4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/jsinterp.py
View File

@ -252,15 +252,20 @@ class JSInterpreter(object):
# XXX: context-free! # XXX: context-free!
close_pos = open_pos = call_m.end() close_pos = open_pos = call_m.end()
counter = 1 counter = 1
in_string = ''
while counter > 0: while counter > 0:
if close_pos > len(self.code): if close_pos > len(self.code):
raise ExtractorError('Runaway argument found of JS call %r' % call) raise ExtractorError('Runaway argument found of JS call %r' % call)
c = self.code[close_pos] c = self.code[close_pos]
close_pos += 1 close_pos += 1
if c == '(': if c == '(' and not in_string:
counter += 1 counter += 1
elif c == ')': elif c == ')' and not in_string:
counter -= 1 counter -= 1
elif in_string and c == in_string:
in_string = ''
elif c in ['"', '\'']:
in_string = c
else: else:
return self.code[open_pos:close_pos - 1] return self.code[open_pos:close_pos - 1]