[FFmpeg-cvslog] eamad: fix excessive memory allocation.

Michael Niedermayer git at videolan.org
Mon Dec 19 16:38:06 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 19 16:27:52 2011 +0100| [03a9c9932dbceff4d42d82b9c4fccf860093f0e9] | committer: Michael Niedermayer

eamad: fix excessive memory allocation.
Fixes Ticket792
Bug found by Oana Stratulat

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

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

 libavcodec/eamad.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 1f62823..cc6f9d3 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -268,6 +268,8 @@ static int decode_frame(AVCodecContext *avctx,
     buf += 16;
 
     if (avctx->width != s->width || avctx->height != s->height) {
+        if((s->width * s->height)/2048*7 > buf_end-buf)
+            return -1;
         if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
             return -1;
         avcodec_set_dimensions(avctx, s->width, s->height);



More information about the ffmpeg-cvslog mailing list