[FFmpeg-cvslog] avformat/hls: Even stricter URL checks

Michael Niedermayer git at videolan.org
Fri Jan 15 17:51:17 CET 2016


ffmpeg | branch: release/2.5 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jan 15 15:29:22 2016 +0100| [83913c6e7e1e2f0d2e5550800e93ec64f31a0077] | committer: Michael Niedermayer

avformat/hls: Even stricter URL checks

This fixes a null pointer dereference at least

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

Conflicts:

	libavformat/hls.c

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

 libavformat/hls.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index de40b6d..7fc761a 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -903,12 +903,16 @@ static void intercept_id3(struct playlist *pls, uint8_t *buf,
 
 static int check_url(const char *url) {
     const char *proto_name = avio_find_protocol_name(url);
+
+    if (!proto_name)
+        return AVERROR_INVALIDDATA;
+
     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,"))
+    else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
         return AVERROR_INVALIDDATA;
 
     return 0;



More information about the ffmpeg-cvslog mailing list