har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move block size check to decoder

Browse Source 
Originally committed as revision 6688 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-10-14 05:01:05 +00:00
parent 03bb9ae58c
commit 4ec0beaa59
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wavpack.c
View File

@ -388,6 +388,11 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr)); memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
s->samples = LE_32(buf); buf += 4; s->samples = LE_32(buf); buf += 4;
/* should not happen but who knows */
if(s->samples * 2 * avctx->channels > AVCODEC_MAX_AUDIO_FRAME_SIZE){
av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
return -1;
}
s->joint = LE_32(buf) & WV_JOINT; buf += 4; s->joint = LE_32(buf) & WV_JOINT; buf += 4;
s->CRC = LE_32(buf); buf += 4; s->CRC = LE_32(buf); buf += 4;
// parse metadata blocks // parse metadata blocks

6
libavformat/wv.c
View File

@ -171,12 +171,6 @@ static int wv_read_packet(AVFormatContext *s,
return -1; return -1;
} }
samples = LE_32(wc->extra);
/* should not happen but who knows */
if(samples * 2 * wc->chan > AVCODEC_MAX_AUDIO_FRAME_SIZE){
av_log(s, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
return -EIO;
}
if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0) if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0)
return AVERROR_NOMEM; return AVERROR_NOMEM;
memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE); memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE);