har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'

Browse Source 
* commit '225e84e74544062706c0159ec0737b0e1d40915f':
  hls: disallow opening nested files in child demuxers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-29 15:50:32 +00:00
commit f1e7c42f08
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

@ -1484,6 +1484,16 @@ static int save_avio_options(AVFormatContext *s)
return ret; return ret;
} }
static int nested_io_open(AVFormatContext *s, AVIOContext **pb, const char *url,
int flags, AVDictionary **opts)
{
av_log(s, AV_LOG_ERROR,
"A HLS playlist item '%s' referred to an external file '%s'. "
"Opening this file was forbidden for security reasons\n",
s->filename, url);
return AVERROR(EPERM);
}
static int hls_read_header(AVFormatContext *s) static int hls_read_header(AVFormatContext *s)
{ {
void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque; void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque;
@ -1604,6 +1614,7 @@ static int hls_read_header(AVFormatContext *s)
goto fail; goto fail;
} }
pls->ctx->pb = &pls->pb; pls->ctx->pb = &pls->pb;
pls->ctx->io_open = nested_io_open;
pls->stream_offset = stream_offset; pls->stream_offset = stream_offset;
if ((ret = ff_copy_whitelists(pls->ctx, s)) < 0) if ((ret = ff_copy_whitelists(pls->ctx, s)) < 0)