1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00

apedec: set s->currentframeblocks after validating nblocks

This commit is contained in:
Justin Ruggles 2011-10-11 13:25:27 -04:00
parent 2cab578489
commit 52d4fb2a3d

View File

@ -841,13 +841,12 @@ static int ape_decode_frame(AVCodecContext *avctx,
}
s->ptr += n;
s->currentframeblocks = nblocks;
buf += 4;
if (!nblocks || nblocks > INT_MAX) {
av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
return AVERROR_INVALIDDATA;
}
s->samples = nblocks;
s->currentframeblocks = s->samples = nblocks;
memset(s->decoded0, 0, sizeof(s->decoded0));
memset(s->decoded1, 0, sizeof(s->decoded1));