Commit 9eb0d76e authored by Derek Buitenhuis's avatar Derek Buitenhuis Committed by Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cbd3a68f)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 508e410d
...@@ -428,6 +428,10 @@ static int parse_adaptation_sets(AVFormatContext *s) ...@@ -428,6 +428,10 @@ static int parse_adaptation_sets(AVFormatContext *s)
char *p = w->adaptation_sets; char *p = w->adaptation_sets;
char *q; char *q;
enum { new_set, parsed_id, parsing_streams } state; 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 // syntax id=0,streams=0,1,2 id=1,streams=3,4 and so on
state = new_set; state = new_set;
while (p < w->adaptation_sets + strlen(w->adaptation_sets)) { while (p < w->adaptation_sets + strlen(w->adaptation_sets)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment