Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Laurent Aimar 13 years ago committed by Michael Niedermayer
parent a5d46235f3
commit 346876ec16
  1. 6
      libavcodec/adpcm.c

@ -641,10 +641,11 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
buf_size -= 128; buf_size -= 128;
} }
break; break;
case CODEC_ID_ADPCM_IMA_EA_EACS: case CODEC_ID_ADPCM_IMA_EA_EACS: {
unsigned header_size = 4 + (8<<st);
samples_in_chunk = bytestream_get_le32(&src) >> (1-st); samples_in_chunk = bytestream_get_le32(&src) >> (1-st);
if (samples_in_chunk > buf_size-4-(8<<st)) { if (buf_size < header_size || samples_in_chunk > buf_size - header_size) {
src += buf_size - 4; src += buf_size - 4;
break; break;
} }
@ -659,6 +660,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
*samples++ = adpcm_ima_expand_nibble(&c->status[st], *src&0x0F, 3); *samples++ = adpcm_ima_expand_nibble(&c->status[st], *src&0x0F, 3);
} }
break; break;
}
case CODEC_ID_ADPCM_IMA_EA_SEAD: case CODEC_ID_ADPCM_IMA_EA_SEAD:
for (; src < buf+buf_size; src++) { for (; src < buf+buf_size; src++) {
*samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6); *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] >> 4, 6);

Loading…
Cancel
Save