highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hls: More strict url checks

Browse Source 
No case is known where these are needed

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

Conflicts:

	libavformat/hls.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Conflicts:

	libavformat/hls.c
This commit is contained in:
Michael Niedermayer 2016-01-15 13:29:38 +01:00
parent 4089af67ab
commit 8d5060192c
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/hls.c
View File

@ -900,6 +900,20 @@ static void intercept_id3(struct playlist *pls, uint8_t *buf,
pls->is_id3_timestamped = (pls->id3_mpegts_timestamp != AV_NOPTS_VALUE);
}
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)
{
AVDictionary *opts = NULL;
@ -927,11 +941,9 @@ static int open_input(HLSContext *c, struct playlist *pls)
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;
ret = check_url(seg->url);
if (ret < 0)
goto cleanup;
}
ret = ffurl_open(&pls->input, seg->url, AVIO_FLAG_READ,
&pls->parent->interrupt_callback, &opts);
@ -940,11 +952,10 @@ static int open_input(HLSContext *c, struct playlist *pls)
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;
ret = check_url(seg->key);
if (ret < 0)
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))