diff options
| author | Maxim Andreev <andreevmaxim@gmail.com> | 2016-01-13 11:51:12 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 16:00:31 +0100 |
| commit | cde38373d134e6cf6a92d900fb2f3ce996e4655c (patch) | |
| tree | 89015fbe07336163514f57e3b7b8b1543e66509b | |
| parent | a2b234b917bf15fd0f60c131b801f0f84bf14ef4 (diff) | |
| download | ffmpeg-cde38373d134e6cf6a92d900fb2f3ce996e4655c.tar.gz | |
avformat/hls: forbid all protocols except http(s) & file
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7145e80b4f78cff5ed5fee04d4c4d53daaa0e077)
Conflicts:
libavformat/hls.c
| -rw-r--r-- | libavformat/hls.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index bd34329cb6..e7e323b71b 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1036,6 +1036,12 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg) seg->url, seg->url_offset, pls->index); if (seg->key_type == KEY_NONE) { + const char *proto_name = avio_find_protocol_name(seg->url); + if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL)) { + ret = AVERROR_INVALIDDATA; + goto cleanup; + } + ret = ffurl_open(&pls->input, seg->url, AVIO_FLAG_READ, &pls->parent->interrupt_callback, &opts); @@ -1043,6 +1049,11 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg) char iv[33], key[33], url[MAX_URL_SIZE]; if (strcmp(seg->key, pls->key_url)) { URLContext *uc; + const char *proto_name = avio_find_protocol_name(seg->key); + if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL)) { + ret = AVERROR_INVALIDDATA; + goto cleanup; + } if (ffurl_open(&uc, seg->key, AVIO_FLAG_READ, &pls->parent->interrupt_callback, &opts2) == 0) { if (ffurl_read_complete(uc, pls->key, sizeof(pls->key)) |