highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return an error when realloc fails.

Browse Source 
Patch by Andy Gocke (agocke gmail com)

Originally committed as revision 12581 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Andy Gocke 2008-03-25 14:48:18 +00:00 committed by Benoit Fouet
parent 28c47a423b
commit 1f96bafb27
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/parser.c
View File

@ -224,7 +224,7 @@ void av_parser_close(AVCodecParserContext *s)
/** /**
* combines the (truncated) bitstream to a complete frame * combines the (truncated) bitstream to a complete frame
* @returns -1 if no complete frame could be created * @returns -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error
*/ */
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
{ {
@ -249,8 +249,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
/* copy into buffer end return */ /* copy into buffer end return */
if(next == END_NOT_FOUND){ if(next == END_NOT_FOUND){
pc->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)
return AVERROR(ENOMEM);
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;
return -1; return -1;
@ -261,8 +264,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){
pc->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)
return AVERROR(ENOMEM);
pc->buffer = new_buffer;
memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
pc->index = 0; pc->index = 0;
*buf= pc->buffer; *buf= pc->buffer;