[FFmpeg-cvslog] Revert "avformat/hls: Check local file extensions"
Michael Niedermayer
git at videolan.org
Mon Jun 5 14:56:36 EEST 2017
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun 5 13:24:36 2017 +0200| [c0702ab8301844c1eb11dedb78a0bce79693dec7] | committer: Michael Niedermayer
Revert "avformat/hls: Check local file extensions"
Requested-by: Paul B Mahol <onemda at gmail.com>
This reverts commit caf7d6178a4d5f24c915da48410a9790b21703aa.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0702ab8301844c1eb11dedb78a0bce79693dec7
---
libavformat/hls.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 01731bd36b..4b8fb19a52 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -204,7 +204,6 @@ typedef struct HLSContext {
char *http_proxy; ///< holds the address of the HTTP proxy server
AVDictionary *avio_opts;
int strict_std_compliance;
- char *allowed_extensions;
} HLSContext;
static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
@@ -619,19 +618,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
return AVERROR_INVALIDDATA;
// only http(s) & file are allowed
- if (av_strstart(proto_name, "file", NULL)) {
- if (strcmp(c->allowed_extensions, "ALL") && !av_match_ext(url, c->allowed_extensions)) {
- av_log(s, AV_LOG_ERROR,
- "Filename extension of \'%s\' is not a common multimedia extension, blocked for security reasons.\n"
- "If you wish to override this adjust allowed_extensions, you can set it to \'ALL\' to allow all\n",
- url);
- return AVERROR_INVALIDDATA;
- }
- } else if (av_strstart(proto_name, "http", NULL)) {
- ;
- } else
+ 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)] == ':')
;
else if (av_strstart(url, "crypto", NULL) && !strncmp(proto_name, url + 7, strlen(proto_name)) && url[7 + strlen(proto_name)] == ':')
@@ -2146,10 +2134,6 @@ static int hls_probe(AVProbeData *p)
static const AVOption hls_options[] = {
{"live_start_index", "segment index to start live streams at (negative values are from the end)",
OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS},
- {"allowed_extensions", "List of file extensions that hls is allowed to access",
- OFFSET(allowed_extensions), AV_OPT_TYPE_STRING,
- {.str = "3gp,aac,avi,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,mpegts,ogg,ogv,oga,ts,vob,wav"},
- INT_MIN, INT_MAX, FLAGS},
{NULL}
};
More information about the ffmpeg-cvslog
mailing list