Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-03-30 03:50:02 +0300
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-02 11:15:07 +0300
commit8bc99045137fa0b69dc5cfe807cbd2dddc66b6be (patch)
tree0bfc8a96d9e60cf1eb289ad5318efba4ed9f79d7 /libavformat
parentf9f3fd9387921957ee93b8081e355596b49e6e82 (diff)
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@gmail.com> (cherry picked from commit cbea58b2b35c6409e062c929f0b2ab763b8661eb) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/webmdashenc.c8
1 files changed, 8 insertions, 0 deletions
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;