virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/parser: reset indexes on realloc failure

Browse Source 
Fixes Ticket2982

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-26 21:03:48 +02:00
parent 5dc6c0ea9e
commit f31011e9ab
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/parser.c
View File

@ -237,8 +237,10 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
if(next == END_NOT_FOUND){ if(next == END_NOT_FOUND){
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
if(!new_buffer) if(!new_buffer) {
pc->index = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
pc->buffer = new_buffer; pc->buffer = new_buffer;
memcpy(&pc->buffer[pc->index], *buf, *buf_size); memcpy(&pc->buffer[pc->index], *buf, *buf_size);
pc->index += *buf_size; pc->index += *buf_size;
@ -251,9 +253,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
/* append to buffer */ /* append to buffer */
if(pc->index){ if(pc->index){
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
if(!new_buffer) {
if(!new_buffer) pc->overread_index =
pc->index = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
pc->buffer = new_buffer; pc->buffer = new_buffer;
if (next > -FF_INPUT_BUFFER_PADDING_SIZE) if (next > -FF_INPUT_BUFFER_PADDING_SIZE)
memcpy(&pc->buffer[pc->index], *buf, memcpy(&pc->buffer[pc->index], *buf,