Rapsys Git
/
youtubedl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update upstream source from tag 'upstream/2018.11.07'
[youtubedl]
/
youtube_dl
/
swfinterp.py
diff --git
a/youtube_dl/swfinterp.py
b/youtube_dl/swfinterp.py
index 2bd264b306f8dc8f53bf6e0b9dec97ecd6e85cb4..0c71585753134e93fba8d8de5cee003d31f050c9 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)'
@@
-101,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
@@
-113,6
+115,8
@@
def _u30(reader):
res = _read_int(reader)
assert res & 0xf0000000 == 0
return res
res = _read_int(reader)
assert res & 0xf0000000 == 0
return res
+
+
_u32 = _read_int
_u32 = _read_int
@@
-127,7
+131,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):
@@
-146,7
+150,7
@@
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
return res
@@
-174,6
+178,7
@@
class _Undefined(object):
return 'undefined'
__repr__ = __str__
return 'undefined'
__repr__ = __str__
+
undefined = _Undefined()
undefined = _Undefined()
@@
-689,7
+694,7
@@
class SWFInterpreter(object):
elif mname in _builtin_classes:
res = _builtin_classes[mname]
else:
elif mname in _builtin_classes:
res = _builtin_classes[mname]
else:
- # Assume unitialized
+ # Assume uni
ni
tialized
# TODO warn here
res = undefined
stack.append(res)
# TODO warn here
res = undefined
stack.append(res)