Browse Source

avformat/matroskadec: Sanity check codec_id/track type

Fixes: memleak
Fixes: 27766/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-5198300814508032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7b88dd8f0c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.3.2
Michael Niedermayer 5 years ago
parent
commit
9a032dfd5f
1 changed files with 9 additions and 0 deletions
  1. +9
    -0
      libavformat/matroskadec.c

+ 9
- 0
libavformat/matroskadec.c View File

@@ -2321,6 +2321,15 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (!track->codec_id)
continue;

if ( track->type == MATROSKA_TRACK_TYPE_AUDIO && track->codec_id[0] != 'A'
|| track->type == MATROSKA_TRACK_TYPE_VIDEO && track->codec_id[0] != 'V'
|| track->type == MATROSKA_TRACK_TYPE_SUBTITLE && track->codec_id[0] != 'D' && track->codec_id[0] != 'S'
|| track->type == MATROSKA_TRACK_TYPE_METADATA && track->codec_id[0] != 'D' && track->codec_id[0] != 'S'
) {
av_log(matroska->ctx, AV_LOG_INFO, "Inconsistent track type\n");
continue;
}

if (track->audio.samplerate < 0 || track->audio.samplerate > INT_MAX ||
isnan(track->audio.samplerate)) {
av_log(matroska->ctx, AV_LOG_WARNING,


Loading…
Cancel
Save