avformat/webmdashenc: Validate the 'streams' adaptation sets parameter
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 20 Apr 2017 15:17:44 +0000 (16:17 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 14 May 2017 10:20:15 +0000 (12:20 +0200)
It should not be a value larger than the number of streams we have,
or it will cause invalid reads and/or SIGSEGV.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ec07efa70012845e8642df67a4a773f510a17088)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/webmdashenc.c

index 740fd8e..9dc9b36 100644 (file)
@@ -462,7 +462,11 @@ static int parse_adaptation_sets(AVFormatContext *s)
             if (as->streams == NULL)
                 return AVERROR(ENOMEM);
             as->streams[as->nb_streams - 1] = to_integer(p, q - p + 1);
-            if (as->streams[as->nb_streams - 1] < 0) return -1;
+            if (as->streams[as->nb_streams - 1] < 0 ||
+                as->streams[as->nb_streams - 1] >= s->nb_streams) {
+                av_log(s, AV_LOG_ERROR, "Invalid value for 'streams' in adapation_sets.\n");
+                return AVERROR(EINVAL);
+            }
             if (*q == '\0') break;
             if (*q == ' ') state = new_set;
             p = ++q;