ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Jan 15 15:29:22 2016 +0100| [cfda1bea4c18ec1edbc11ecc465f788b02851488] | committer: Michael Niedermayer
avformat/hls: Even stricter URL checks This fixes a null pointer dereference at least Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfda1bea4c18ec1edbc11ecc465f788b02851488 --- libavformat/hls.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index e4b5de5..7a8610c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -611,12 +611,16 @@ static int open_url(HLSContext *c, URLContext **uc, const char *url, AVDictionar AVDictionary *tmp = NULL; int ret; const char *proto_name = avio_find_protocol_name(url); + + if (!proto_name) + return AVERROR_INVALIDDATA; + // 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,")) + else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5)) return AVERROR_INVALIDDATA; av_dict_copy(&tmp, c->avio_opts, 0); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
