diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 15:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-31 00:25:20 +0100 |
| commit | c0df58b0e5ecee6a5f91236a689395c1a8368461 (patch) | |
| tree | a0286d5f4e32a77def110b7a2efda2c718e6a3c9 | |
| parent | 990abbd1c6123e39c8115b19967ba16bc69262b7 (diff) | |
| download | ffmpeg-c0df58b0e5ecee6a5f91236a689395c1a8368461.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)
Conflicts:
libavformat/hls.c
| -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 63ab9511d9..6c6a0029df 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; |