Compare commits

...
2 Commits
Author SHA1 Message Date
Kevin Mitchell 7214f1f076 Release 0.28.2 2018-02-12 18:07:05 -08:00
Ricardo Constantino 789e04e9a0 ytdl_hook: whitelist subtitle URLs as well
This was overlooked when doing the whitelisting for video and audio to
fix #5456.
2018-02-12 17:43:55 -08:00
3 changed files with 14 additions and 3 deletions

No files matched your search

+9
View File
@@ -1,3 +1,12 @@
Release 0.28.2
==============
This release contains an additional fix for CVE-2018-6360.
Fixes and Minor Enhancements
----------------------------
- ytdl_hook: whitelist subtitle URLs as well (#5456)
Release 0.28.1
==============
+1 -1
View File
@@ -1 +1 @@
0.28.1
0.28.2
+4 -2
View File
@@ -270,7 +270,8 @@ local function add_single_video(json)
if not (sub_info.data == nil) then
sub = "memory://"..sub_info.data
elseif not (sub_info.url == nil) then
elseif not (sub_info.url == nil) and
url_is_safe(sub_info.url) then
sub = sub_info.url
end
@@ -468,7 +469,8 @@ mp.add_hook("on_load", 10, function ()
local subfile = "edl://"
for i, entry in pairs(json.entries) do
if not (entry.requested_subtitles == nil) and
not (entry.requested_subtitles[j] == nil) then
not (entry.requested_subtitles[j] == nil) and
url_is_safe(entry.requested_subtitles[j].url) then
subfile = subfile..edl_escape(entry.requested_subtitles[j].url)
else
subfile = subfile..edl_escape("memory://WEBVTT")