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

factorize code and add safety check to prevent memcpying negative amounts

Browse Source 
Originally committed as revision 10722 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-10-13 09:58:39 +00:00
parent 0d43dd8c2d
commit 211dd1e81f
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/aac_ac3_parser.c
View File

@ -37,16 +37,18 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
buf_ptr = buf;
while (buf_size > 0) {
int size_needed= s->frame_size ? s->frame_size : s->header_size;
len = s->inbuf_ptr - s->inbuf;
if (s->frame_size == 0) {
/* no header seen : find one. We need at least s->header_size
bytes to parse it */
len = FFMIN(s->header_size - len, buf_size);
if(len<size_needed){
len = FFMIN(size_needed - len, buf_size);
memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len;
buf_ptr += len;
s->inbuf_ptr += len;
buf_size -= len;
buf_size -= len;
}
if (s->frame_size == 0) {
if ((s->inbuf_ptr - s->inbuf) == s->header_size) {
len = s->sync(s->inbuf, &channels, &sample_rate, &bit_rate,
&samples);
@ -71,13 +73,6 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
}
}
} else {
len = FFMIN(s->frame_size - len, buf_size);
memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len;
s->inbuf_ptr += len;
buf_size -= len;
if(s->inbuf_ptr - s->inbuf == s->frame_size){
*poutbuf = s->inbuf;
*poutbuf_size = s->frame_size;