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

avformat/hls: More strict url checks 

No case is known where these are needed

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

Conflicts:

	libavformat/hls.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-01-15 13:29:38 +01:00
parent 119659b759
commit 123d356829
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/hls.c
View File

@ -1010,6 +1010,19 @@ static void update_options(char **dest, const char *name, void *src)
av_freep(dest); av_freep(dest);
} }
static int check_url(const char *url) {
const char *proto_name = avio_find_protocol_name(url);
if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL))
return AVERROR_INVALIDDATA;
if (!strncmp(proto_name, url, strlen(proto_name)) && url[strlen(proto_name)] == ':')
return 0;
else if (strcmp(proto_name, "file") || !strcmp(url, "file,"))
return AVERROR_INVALIDDATA;
return 0;
}
static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg) static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg)
{ {
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
@ -1036,11 +1049,9 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg)
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); ret = check_url(seg->url);
if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL)) { if (ret < 0)
ret = AVERROR_INVALIDDATA;
goto cleanup; 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);
@ -1049,11 +1060,10 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg)
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); ret = check_url(seg->key);
if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL)) { if (ret < 0)
ret = AVERROR_INVALIDDATA;
goto cleanup; 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))