Browse Source

aiff: check block_align in aiff_read_packet

It can be unset in avcodec_parameters_from_context and a value of 0
causes SIGFPE crashes.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 93c39db5f1)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
tags/n3.1.6
Andreas Cadhalpun 9 years ago
parent
commit
2c52b74980
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavformat/aiffdec.c

+ 5
- 0
libavformat/aiffdec.c View File

@@ -367,6 +367,11 @@ static int aiff_read_packet(AVFormatContext *s,
if (max_size <= 0)
return AVERROR_EOF;

if (!st->codecpar->block_align) {
av_log(s, AV_LOG_ERROR, "block_align not set\n");
return AVERROR_INVALIDDATA;
}

/* Now for that packet */
switch (st->codecpar->codec_id) {
case AV_CODEC_ID_ADPCM_IMA_QT:


Loading…
Cancel
Save