diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2017-04-20 13:14:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-20 18:07:32 +0200 |
| commit | cbd3a68f3e1c2d1679370301eb5e1a32a2df64fe (patch) | |
| tree | 13c9ea03a71c486b46ae7e8a68c7cbc2952f8bd5 /libavformat | |
| parent | 0f05f2c7e67949ce77de3cf7013f7d4da1c3e046 (diff) | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/webmdashenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 602726caf9..71f01fd770 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)) { |