Skip to content

Commit

Permalink
avformat/hls: Even stricter URL checks
Browse files Browse the repository at this point in the history
This fixes a null pointer dereference at least

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
michaelni committed Jan 15, 2016
1 parent 6ba42b6 commit cfda1be
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion libavformat/hls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit cfda1be

Please sign in to comment.