Mercurial > libavcodec.hg
changeset 6534:23b2a64342f2 libavcodec
Return an error when realloc fails.
Patch by Andy Gocke (agocke gmail com)
| author | benoit |
|---|---|
| date | Tue, 25 Mar 2008 14:48:18 +0000 |
| parents | b4c000318ed4 |
| children | 34717463c154 |
| files | parser.c |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/parser.c Tue Mar 25 14:34:27 2008 +0000 +++ b/parser.c Tue Mar 25 14:48:18 2008 +0000 @@ -224,7 +224,7 @@ /** * 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) { @@ -249,8 +249,11 @@ /* copy into buffer end return */ 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); pc->index += *buf_size; return -1; @@ -261,8 +264,11 @@ /* append to buffer */ 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 ); pc->index = 0; *buf= pc->buffer;