diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-26 21:03:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 18:13:55 +0200 |
| commit | 9b02aa25937ff0990b7d8558f04293384d682eb1 (patch) | |
| tree | 10101de0bc2960784a104326ac7ed72f78641f46 | |
| parent | f089e67d515b726ac14103025edc04f6df346a3f (diff) | |
| download | ffmpeg-9b02aa25937ff0990b7d8558f04293384d682eb1.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 500bbb8f54..8a825938a6 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -237,8 +237,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; @@ -251,9 +253,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, |