summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2018-02-11 13:18:10 +0000
committerKevin Mitchell <kevmitch@gmail.com>2018-02-12 17:43:55 -0800
commit789e04e9a08075c3bf744b8d5223f61116e8d2c0 (patch)
treed704aecb9eec84033aa1d1931dd2130850916d04
parent2ae812ec6dbe2d267f47769b9e4250d677504d9b (diff)
downloadmpv-789e04e9a08075c3bf744b8d5223f61116e8d2c0.tar.bz2
mpv-789e04e9a08075c3bf744b8d5223f61116e8d2c0.tar.xz
ytdl_hook: whitelist subtitle URLs as well
This was overlooked when doing the whitelisting for video and audio to fix #5456.
-rw-r--r--player/lua/ytdl_hook.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index 405c212419..5bfed0d645 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -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")