[FFmpeg-cvslog] avformat/webmdashenc: Check codec types

Andreas Rheinhardt git at videolan.org
Wed May 20 08:37:45 EEST 2020


ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Mar 30 02:50:02 2020 +0200| [84b2ec226abd6edc1f7b85c8ef2de07ae3bb07d7] | committer: Andreas Rheinhardt

avformat/webmdashenc: Check codec types

The WebM DASH Manifest muxer only supports VP8, VP9, Vorbis and Opus,
but there was no check for this. The codec type is used to get a pointer
to a string containing the codec name or NULL if it is not one of those
four codecs. Said pointer has then been used without further checks as
string for the %s conversion specifier in an avio_printf()) call which
is undefined behaviour.

This commit adds a check for the supported codec types.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit cbea58b2b35c6409e062c929f0b2ab763b8661eb)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84b2ec226abd6edc1f7b85c8ef2de07ae3bb07d7
---

 libavformat/webmdashenc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c
index 14c3888b1e..542410f26b 100644
--- a/libavformat/webmdashenc.c
+++ b/libavformat/webmdashenc.c
@@ -517,6 +517,14 @@ static int webm_dash_manifest_write_header(AVFormatContext *s)
     double start = 0.0;
     int ret;
     WebMDashMuxContext *w = s->priv_data;
+
+    for (unsigned i = 0; i < s->nb_streams; i++) {
+        enum AVCodecID codec_id = s->streams[i]->codecpar->codec_id;
+        if (codec_id != AV_CODEC_ID_VP8    && codec_id != AV_CODEC_ID_VP9 &&
+            codec_id != AV_CODEC_ID_VORBIS && codec_id != AV_CODEC_ID_OPUS)
+            return AVERROR(EINVAL);
+    }
+
     ret = parse_adaptation_sets(s);
     if (ret < 0) {
         goto fail;



More information about the ffmpeg-cvslog mailing list