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

apedec: use unsigned int for 'nblocks' and make sure that it's within int range

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

8
libavcodec/apedec.c
View File

@ -812,7 +812,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size; int buf_size = avpkt->size;
APEContext *s = avctx->priv_data; APEContext *s = avctx->priv_data;
int16_t *samples = data; int16_t *samples = data;
int nblocks; uint32_t nblocks;
int i, n; int i, n;
int blockstodecode; int blockstodecode;
int bytes_used; int bytes_used;
@ -843,9 +843,9 @@ static int ape_decode_frame(AVCodecContext *avctx,
s->currentframeblocks = nblocks; s->currentframeblocks = nblocks;
buf += 4; buf += 4;
if (nblocks <= 0) { if (!nblocks || nblocks > INT_MAX) {
*data_size = 0; av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
return buf_size; return AVERROR_INVALIDDATA;
} }
s->samples = nblocks; s->samples = nblocks;