Commit 9662539c authored by Justin Ruggles's avatar Justin Ruggles

adpcm: check buffer size in Funcom ISS decoder before reading header.

Also use the post-header data size to control termination of the main
decoding loop.
parent ba5d2890
...@@ -593,6 +593,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -593,6 +593,12 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
} }
break; break;
case CODEC_ID_ADPCM_IMA_ISS: case CODEC_ID_ADPCM_IMA_ISS:
n = buf_size - 4 * avctx->channels;
if (n < 0) {
av_log(avctx, AV_LOG_ERROR, "packet is too small\n");
return AVERROR(EINVAL);
}
for (channel = 0; channel < avctx->channels; channel++) { for (channel = 0; channel < avctx->channels; channel++) {
cs = &c->status[channel]; cs = &c->status[channel];
cs->predictor = (int16_t)bytestream_get_le16(&src); cs->predictor = (int16_t)bytestream_get_le16(&src);
...@@ -600,7 +606,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -600,7 +606,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
src++; src++;
} }
while (src < buf + buf_size) { while (n-- > 0) {
uint8_t v1, v2; uint8_t v1, v2;
uint8_t v = *src++; uint8_t v = *src++;
/* nibbles are swapped for mono */ /* nibbles are swapped for mono */
......
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