ffmpeg | branch: release/2.6 | Michael Niedermayer <mich...@niedermayer.cc> |
Fri Jan 15 15:29:22 2016 +0100| [82db8bcffae0010c638a01069d0754c06960470d] |
committer: Michael Niedermayer
avformat/hls: Even stricter URL checks
This fixes a null pointer dereference at least
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit cfda1bea4c18ec1edbc11ecc465f788b02851488)
Conflicts:
libavformat/hls.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82db8bcffae0010c638a01069d0754c06960470d
---
libavformat/hls.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 6c3424b..8aa9a83 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;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
