Commit 18ca491b authored by David Conrad's avatar David Conrad

mkvdec: Avoid divide-by-zero crash on invalid real audio tracks

Originally committed as revision 21129 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 24ca518b
...@@ -1634,9 +1634,10 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, ...@@ -1634,9 +1634,10 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (res == 0) { if (res == 0) {
for (n = 0; n < laces; n++) { for (n = 0; n < laces; n++) {
if (st->codec->codec_id == CODEC_ID_RA_288 || if ((st->codec->codec_id == CODEC_ID_RA_288 ||
st->codec->codec_id == CODEC_ID_COOK || st->codec->codec_id == CODEC_ID_COOK ||
st->codec->codec_id == CODEC_ID_ATRAC3) { st->codec->codec_id == CODEC_ID_ATRAC3) &&
st->codec->block_align && track->audio.sub_packet_size) {
int a = st->codec->block_align; int a = st->codec->block_align;
int sps = track->audio.sub_packet_size; int sps = track->audio.sub_packet_size;
int cfs = track->audio.coded_framesize; int cfs = track->audio.coded_framesize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment