diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 21:03:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 23:25:00 +0200 |
| commit | eec833b10ddaf656d7840208c9fbe3458c8c8c3d (patch) | |
| tree | 312755b4085cfb2256be51793bcb0abc42ef14b1 | |
| parent | 9b0736c08ac59ae5da598ef32e9165ddf5c3f645 (diff) | |
| download | ffmpeg-eec833b10ddaf656d7840208c9fbe3458c8c8c3d.tar.gz | |
avcodec/parser: reset indexes on realloc failure
Fixes Ticket2982
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f31011e9abfb2ae75bb32bc44e2c34194c8dc40a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/parser.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 7f18a26631..8530673cd5 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -242,8 +242,10 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s 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); - if(!new_buffer) + if(!new_buffer) { + pc->index = 0; return AVERROR(ENOMEM); + } pc->buffer = new_buffer; memcpy(&pc->buffer[pc->index], *buf, *buf_size); pc->index += *buf_size; @@ -256,9 +258,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s /* append to buffer */ if(pc->index){ 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); + } pc->buffer = new_buffer; if (next > -FF_INPUT_BUFFER_PADDING_SIZE) memcpy(&pc->buffer[pc->index], *buf, |