[FFmpeg-cvslog] avformat/hls: More strict url checks

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jan 15 13:29:38 2016 +0100| [23b903aaf4eefb1ce1396a32525c8e5501d5cec8] | committer: Michael Niedermayer

avformat/hls: More strict url checks

No case is known where these are needed

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23b903aaf4eefb1ce1396a32525c8e5501d5cec8
---

 libavformat/hls.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 44b656d..6e9832f 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -622,6 +622,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);