mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-06 02:49:35 +02:00
Tolerate junk at the end of gzip-compressed content (#1268)
This commit is contained in:
parent
4f5f18acb9
commit
aa3e950764
@ -628,8 +628,23 @@ def http_response(self, req, resp):
|
|||||||
old_resp = resp
|
old_resp = resp
|
||||||
# gzip
|
# gzip
|
||||||
if resp.headers.get('Content-encoding', '') == 'gzip':
|
if resp.headers.get('Content-encoding', '') == 'gzip':
|
||||||
gz = gzip.GzipFile(fileobj=io.BytesIO(resp.read()), mode='r')
|
content = resp.read()
|
||||||
resp = self.addinfourl_wrapper(gz, old_resp.headers, old_resp.url, old_resp.code)
|
gz = gzip.GzipFile(fileobj=io.BytesIO(content), mode='rb')
|
||||||
|
try:
|
||||||
|
uncompressed = io.BytesIO(gz.read())
|
||||||
|
except IOError as original_ioerror:
|
||||||
|
# There may be junk add the end of the file
|
||||||
|
# See http://stackoverflow.com/q/4928560/35070 for details
|
||||||
|
for i in range(1, 1024):
|
||||||
|
try:
|
||||||
|
gz = gzip.GzipFile(fileobj=io.BytesIO(content[:-i]), mode='rb')
|
||||||
|
uncompressed = io.BytesIO(gz.read())
|
||||||
|
except IOError:
|
||||||
|
continue
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
raise original_ioerror
|
||||||
|
resp = self.addinfourl_wrapper(uncompressed, old_resp.headers, old_resp.url, old_resp.code)
|
||||||
resp.msg = old_resp.msg
|
resp.msg = old_resp.msg
|
||||||
# deflate
|
# deflate
|
||||||
if resp.headers.get('Content-encoding', '') == 'deflate':
|
if resp.headers.get('Content-encoding', '') == 'deflate':
|
||||||
|
Loading…
Reference in New Issue
Block a user