[libav-stable] eacmv: clear references on frame dimensions change

Anton Khirnov git at libav.org
Tue Feb 4 22:06:51 CET 2014


Module: libav
Branch: master
Commit: 5430839144c6da0160e8e0cfb0c8db01de432e94

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Thu Nov 28 10:54:35 2013 +0100

eacmv: clear references on frame dimensions change

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable at libav.org

---

 libavcodec/eacmv.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 1a4e16e..6adadb1 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -141,6 +141,12 @@ static int cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t *
     s->width  = AV_RL16(&buf[4]);
     s->height = AV_RL16(&buf[6]);
 
+    if (s->width  != s->avctx->width ||
+        s->height != s->avctx->height) {
+        av_frame_unref(s->last_frame);
+        av_frame_unref(s->last2_frame);
+    }
+
     ret = ff_set_dimensions(s->avctx, s->width, s->height);
     if (ret < 0)
         return ret;



More information about the libav-stable mailing list