generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apedec: set s->currentframeblocks after validating nblocks

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-11 13:25:27 -04:00
parent 2cab578489
commit 52d4fb2a3d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/apedec.c
View File

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