virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

alac : check readsamplesize to ensure get_bits() doesn't

Browse Source 
fail. Patch by Matthieu Castet <castet.matthieu AT free fr>

Originally committed as revision 14905 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Matthieu Castet 2008-08-22 15:09:20 +00:00 committed by Jai Menon
parent ec6cda8c6e
commit 95801b6a07
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/alac.c
View File

@ -411,7 +411,7 @@ static int alac_decode_frame(AVCodecContext *avctx,
int channels; int channels;
unsigned int outputsamples; unsigned int outputsamples;
int hassize; int hassize;
int readsamplesize; unsigned int readsamplesize;
int wasted_bytes; int wasted_bytes;
int isnotcompressed; int isnotcompressed;
uint8_t interlacing_shift; uint8_t interlacing_shift;
@ -476,6 +476,10 @@ static int alac_decode_frame(AVCodecContext *avctx,
*outputsize = outputsamples * alac->bytespersample; *outputsize = outputsamples * alac->bytespersample;
readsamplesize = alac->setinfo_sample_size - (wasted_bytes * 8) + channels - 1; readsamplesize = alac->setinfo_sample_size - (wasted_bytes * 8) + channels - 1;
if (readsamplesize > MIN_CACHE_BITS) {
av_log(avctx, AV_LOG_ERROR, "readsamplesize too big (%d)\n", readsamplesize);
return -1;
}
if (!isnotcompressed) { if (!isnotcompressed) {
/* so it is compressed */ /* so it is compressed */