summaryrefslogtreecommitdiff
path: root/libavcodec/eacmv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-28 10:54:35 +0100
committerAnton Khirnov <anton@khirnov.net>2014-02-04 21:59:14 +0100
commit5430839144c6da0160e8e0cfb0c8db01de432e94 (patch)
tree3199e4edf7226985063badeed6cddb6203d1c619 /libavcodec/eacmv.c
parent0e830094ad0dc251613a0aa3234d9c5c397e02e6 (diff)
eacmv: clear references on frame dimensions change
Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
Diffstat (limited to 'libavcodec/eacmv.c')
-rw-r--r--libavcodec/eacmv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 1a4e16e15e..6adadb12d1 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;