Browse Source

avformat/movenc: Check that frame_types other than EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id

Fixes: out of array access
Fixes: ffmpeg_bof_1.avi

Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ed22dc2221)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.4.3
Michael Niedermayer 7 years ago
parent
commit
36c779bffe
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavformat/movenc.c

+ 5
- 0
libavformat/movenc.c View File

@@ -388,6 +388,11 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
info->ec3_done = 1; info->ec3_done = 1;
goto concatenate; goto concatenate;
} }
} else {
if (hdr->substreamid != 0) {
avpriv_request_sample(mov->fc, "Multiple non EAC3 independent substreams");
return AVERROR_PATCHWELCOME;
}
} }


/* fill the info needed for the "dec3" atom */ /* fill the info needed for the "dec3" atom */


Loading…
Cancel
Save