diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 15:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 15:49:35 +0100 |
| commit | 28f89bc439be1de9a61ac404ce79f9bc4cac5ec8 (patch) | |
| tree | 4183d80bb7d423944082d5fee6d23b2f3d930fe1 | |
| parent | 23b903aaf4eefb1ce1396a32525c8e5501d5cec8 (diff) | |
| download | ffmpeg-28f89bc439be1de9a61ac404ce79f9bc4cac5ec8.tar.gz | |
avformat/hls: Even stricter URL checks
This fixes a null pointer dereference at least
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cfda1bea4c18ec1edbc11ecc465f788b02851488)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/hls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 6e9832fe68..c32ecb129d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -619,12 +619,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); |