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:23:55 +0100 |
| commit | 82db8bcffae0010c638a01069d0754c06960470d (patch) | |
| tree | 81ab37e8ee031e87de713df544ed30e2f7bb66c6 | |
| parent | 232c2ed4a4a546ee28b84dc1673660fbfeb08d2f (diff) | |
| download | ffmpeg-82db8bcffae0010c638a01069d0754c06960470d.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 6c3424b43c..8aa9a83938 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -913,12 +913,16 @@ static void update_options(char **dest, const char *name, void *src) 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; |