From cbd3a68f3e1c2d1679370301eb5e1a32a2df64fe Mon Sep 17 00:00:00 2001
From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Thu, 20 Apr 2017 13:14:42 +0100
Subject: [PATCH] avformat/webmdashenc: Require the 'adaptation_sets' option to
be set
This seems to be non-optional, and if the muxer is run without it,
strlen() is run on NULL, causing a segfault.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/webmdashenc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c
index 602726caf96..71f01fd7702 100644
--- a/libavformat/webmdashenc.c
+++ b/libavformat/webmdashenc.c
@@ -433,6 +433,10 @@ static int parse_adaptation_sets(AVFormatContext *s)
char *p = w->adaptation_sets;
char *q;
enum { new_set, parsed_id, parsing_streams } state;
+ if (!w->adaptation_sets) {
+ av_log(s, AV_LOG_ERROR, "The 'adaptation_sets' option must be set.\n");
+ return AVERROR(EINVAL);
+ }
// syntax id=0,streams=0,1,2 id=1,streams=3,4 and so on
state = new_set;
while (p < w->adaptation_sets + strlen(w->adaptation_sets)) {
--
GitLab