commit 9a073b1f0f27471fdad501d6f1fff0dd1b482d63
author Michael Niedermayer <michaelni@gmx.at> Thu Sep 26 21:03:48 2013 +0200
committer Michael Niedermayer <michaelni@gmx.at> Thu Jan 16 20:54:14 2014 +0100
tree eda6b60985959e54215aab562cf04993d8aa7904
parent 792ee2f7750cb158a8ca39f8b6a1aef5ba102551

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>

libavcodec/parser.c

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 864b5f2..1d8eb3a 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -271,8 +271,10 @@
     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;
@@ -285,9 +287,11 @@
     /* 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;
         memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
         pc->index = 0;