[FFmpeg-cvslog] flashsv: only realloc blocks for version 2

Michael Niedermayer git at videolan.org
Thu Nov 15 21:03:44 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 15 20:56:28 2012 +0100| [ea3eaa37b119f79f64fd6af2c24b81bb9e7dff6f] | committer: Michael Niedermayer

flashsv: only realloc blocks for version 2

Fixes 10l regression introducing a memleak

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

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

 libavcodec/flashsv.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 27f5dce..9e13ea6 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -322,9 +322,10 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
         s->keyframedata = av_realloc(s->keyframedata, avpkt->size);
         memcpy(s->keyframedata, avpkt->data, avpkt->size);
     }
-    s->blocks = av_realloc(s->blocks,
-                            (v_blocks + !!v_part) * (h_blocks + !!h_part)
-                            * sizeof(s->blocks[0]));
+    if(s->ver == 2)
+        s->blocks = av_realloc(s->blocks,
+                                (v_blocks + !!v_part) * (h_blocks + !!h_part)
+                                * sizeof(s->blocks[0]));
 
     av_dlog(avctx, "image: %dx%d block: %dx%d num: %dx%d part: %dx%d\n",
             s->image_width, s->image_height, s->block_width, s->block_height,



More information about the ffmpeg-cvslog mailing list