ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Jan 15 13:29:38 2016 +0100| [6ba42b6482c725a59eb468391544dc0c75b8c6f0] | committer: Michael Niedermayer
avformat/hls: More strict url checks No case is known where these are needed Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ba42b6482c725a59eb468391544dc0c75b8c6f0 --- libavformat/hls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8063afc..e4b5de5 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -614,6 +614,10 @@ static int open_url(HLSContext *c, URLContext **uc, const char *url, AVDictionar // only http(s) & file are allowed 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 (strcmp(proto_name, "file") || !strcmp(url, "file,")) + return AVERROR_INVALIDDATA; av_dict_copy(&tmp, c->avio_opts, 0); av_dict_copy(&tmp, opts, 0); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
