RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/hls: forbid all protocols except http(s) & file 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7145e80b4f)

Conflicts:

	libavformat/hls.c
This commit is contained in:
Maxim Andreev 2016-01-13 11:51:12 +03:00 committed by Michael Niedermayer
parent a7dea6f2cd
commit e183075dc1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/hls.c
View File

@ -927,6 +927,12 @@ static int open_input(HLSContext *c, struct playlist *pls)
seg->url, seg->url_offset, pls->index); seg->url, seg->url_offset, pls->index);
if (seg->key_type == KEY_NONE) { 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, ret = ffurl_open(&pls->input, seg->url, AVIO_FLAG_READ,
&pls->parent->interrupt_callback, &opts); &pls->parent->interrupt_callback, &opts);
@ -934,6 +940,11 @@ static int open_input(HLSContext *c, struct playlist *pls)
char iv[33], key[33], url[MAX_URL_SIZE]; char iv[33], key[33], url[MAX_URL_SIZE];
if (strcmp(seg->key, pls->key_url)) { if (strcmp(seg->key, pls->key_url)) {
URLContext *uc; 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, if (ffurl_open(&uc, seg->key, AVIO_FLAG_READ,
&pls->parent->interrupt_callback, &opts2) == 0) { &pls->parent->interrupt_callback, &opts2) == 0) {
if (ffurl_read_complete(uc, pls->key, sizeof(pls->key)) if (ffurl_read_complete(uc, pls->key, sizeof(pls->key))