[FFmpeg-cvslog] apedec: check for data buffer realloc failure

Justin Ruggles git at videolan.org
Fri Nov 4 20:49:29 CET 2011


ffmpeg | branch: release/0.7 | Justin Ruggles <justin.ruggles at gmail.com> | Tue Oct 11 12:47:11 2011 -0400| [43fa5bf55ed5e1a26fff6d0cd434fb911250ee9a] | committer: Michael Niedermayer

apedec: check for data buffer realloc failure
(cherry picked from commit 11ca8b2d7486e879926488404b3b79af774f0f2d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43fa5bf55ed5e1a26fff6d0cd434fb911250ee9a
---

 libavcodec/apedec.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 7cf72a0..4c2d238 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -819,7 +819,10 @@ static int ape_decode_frame(AVCodecContext * avctx,
     }
 
     if(!s->samples){
-        s->data = av_realloc(s->data, (buf_size + 3) & ~3);
+        void *tmp_data = av_realloc(s->data, (buf_size + 3) & ~3);
+        if (!tmp_data)
+            return AVERROR(ENOMEM);
+        s->data = tmp_data;
         s->dsp.bswap_buf((uint32_t*)s->data, (const uint32_t*)buf, buf_size >> 2);
         s->ptr = s->last_ptr = s->data;
         s->data_end = s->data + buf_size;



More information about the ffmpeg-cvslog mailing list