RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent AAC frame size overflows. 

Originally committed as revision 19381 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-07-08 23:12:53 +00:00
parent 5962f6b0da
commit 48d20c11ba
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/aacenc.c
View File

@ -540,6 +540,8 @@ static int aac_encode_frame(AVCodecContext *avctx,
} }
start_ch += chans; start_ch += chans;
} }
do {
int frame_bits;
init_put_bits(&s->pb, frame, buf_size*8); init_put_bits(&s->pb, frame, buf_size*8);
if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)) if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT))
put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
@ -586,6 +588,14 @@ static int aac_encode_frame(AVCodecContext *avctx,
start_ch += chans; start_ch += chans;
} }
frame_bits = put_bits_count(&s->pb);
if (frame_bits <= 6144 * avctx->channels - 3)
break;
s->lambda *= avctx->bit_rate * 1024.0f / avctx->sample_rate / frame_bits;
} while (1);
put_bits(&s->pb, 3, TYPE_END); put_bits(&s->pb, 3, TYPE_END);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
avctx->frame_bits = put_bits_count(&s->pb); avctx->frame_bits = put_bits_count(&s->pb);
@ -597,10 +607,6 @@ static int aac_encode_frame(AVCodecContext *avctx,
s->lambda = fminf(s->lambda, 65536.f); s->lambda = fminf(s->lambda, 65536.f);
} }
if (avctx->frame_bits > 6144*avctx->channels)
av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n",
avctx->frame_bits, 6144*avctx->channels);
if (!data) if (!data)
s->last_frame = 1; s->last_frame = 1;
memcpy(s->samples, s->samples + 1024 * avctx->channels, memcpy(s->samples, s->samples + 1024 * avctx->channels,