diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 15:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 17:39:05 +0100 |
| commit | 83913c6e7e1e2f0d2e5550800e93ec64f31a0077 (patch) | |
| tree | 137cb0c33845adb528e18682f52c4657b69332c0 | |
| parent | 8d5060192cf2bdd9e504e640bc5aafee3a04b99b (diff) | |
| download | ffmpeg-83913c6e7e1e2f0d2e5550800e93ec64f31a0077.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 de40b6de9d..7fc761ac8c 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; |