diff options
| author | wm4 <wm4@nowhere> | 2015-03-02 19:09:36 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-02 19:09:36 +0100 |
| commit | a4b6bf8c41b54554286117b97e78412a32b5147f (patch) | |
| tree | fa745bdb50a2cf0c51e99aa710b042a2e75eba08 /stream | |
| parent | 01b87e509c292189acdd96bc7a216b50eafbce9e (diff) | |
| download | mpv-a4b6bf8c41b54554286117b97e78412a32b5147f.tar.bz2 mpv-a4b6bf8c41b54554286117b97e78412a32b5147f.tar.xz | |
player: refine rar:// playlist-safety handling
It was possible to make the player play local files by putting rar://
links into remote playlists, and some other potentially unsafe things.
Redo the handling of it. Now the rar-redirector (the thing in
demux_playlist.c) sets disable_safety, which makes the player open any
playlist entries returned. This is fine, because it redirects to the
same file anyway (just with different selection/interpretation of the
contents). On the other hand, rar:// itself is now considered fully
unsafe, which means that it is ignored if found in normal playlists.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream.c | 1 | ||||
| -rw-r--r-- | stream/stream.h | 1 | ||||
| -rw-r--r-- | stream/stream_rar.c | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/stream/stream.c b/stream/stream.c index c16221add6..91f430f1e6 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -735,7 +735,6 @@ static stream_t *open_cache(stream_t *orig, const char *name) cache->mime_type = talloc_strdup(cache, orig->mime_type); cache->demuxer = talloc_strdup(cache, orig->demuxer); cache->lavf_type = talloc_strdup(cache, orig->lavf_type); - cache->safe_origin = orig->safe_origin; cache->streaming = orig->streaming, cache->is_network = orig->is_network; cache->opts = orig->opts; diff --git a/stream/stream.h b/stream/stream.h index 9908951bad..b2b92cd6eb 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -194,7 +194,6 @@ typedef struct stream { bool streaming : 1; // known to be a network stream if true bool seekable : 1; // presence of general byte seeking support bool fast_skip : 1; // consider stream fast enough to fw-seek by skipping - bool safe_origin : 1; // used for playlists that can be opened safely bool is_network : 1; // original stream_info_t.is_network flag bool allow_caching : 1; // stream cache makes sense struct mp_log *log; diff --git a/stream/stream_rar.c b/stream/stream_rar.c index 1051e05ab4..510babf949 100644 --- a/stream/stream_rar.c +++ b/stream/stream_rar.c @@ -98,8 +98,8 @@ static int rar_entry_open(stream_t *stream) *name++ = '\0'; mp_url_unescape_inplace(base); - struct stream *rar = stream_create(base, STREAM_READ, stream->cancel, - stream->global); + struct stream *rar = stream_create(base, STREAM_READ | STREAM_SAFE_ONLY, + stream->cancel, stream->global); if (!rar) return STREAM_ERROR; @@ -146,6 +146,4 @@ const stream_info_t stream_info_rar = { .name = "rar", .open = rar_entry_open, .protocols = (const char*const[]){ "rar", NULL }, - .is_safe = true, - .is_network = true, // safe over network }; |