aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-15 15:29:22 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-15 15:29:22 +0100
commitcfda1bea4c18ec1edbc11ecc465f788b02851488 (patch)
tree6a56e85a0b77d45bba0d9f9b23fe18ceaece1afa
parent6ba42b6482c725a59eb468391544dc0c75b8c6f0 (diff)
downloadffmpeg-cfda1bea4c18ec1edbc11ecc465f788b02851488.tar.gz
avformat/hls: Even stricter URL checks
This fixes a null pointer dereference at least Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/hls.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index e4b5de5da9..7a8610cafb 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);