aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-24 23:16:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:24:39 +0200
commit1ed90c84f6ab75af91b08436cefb8ea464f8495b (patch)
tree3aceb0009d6782ed830f4ee012fa9e8ed85b17d3
parent21c9d92646f375f0c3ff9b2bc7b2f5f07a150e74 (diff)
downloadffmpeg-1ed90c84f6ab75af91b08436cefb8ea464f8495b.tar.gz
Check for invalid update parameters in vmd video decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e7aed1280ea14b60fceae04d71dfd03e1daf2d04)
-rw-r--r--libavcodec/vmdav.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index ebc8c7eb1d..d7cd3bbb87 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -204,6 +204,16 @@ static void vmd_decode(VmdVideoContext *s)
frame_y = AV_RL16(&s->buf[8]);
frame_width = AV_RL16(&s->buf[10]) - frame_x + 1;
frame_height = AV_RL16(&s->buf[12]) - frame_y + 1;
+ if (frame_x < 0 || frame_width < 0 ||
+ frame_x >= s->avctx->width ||
+ frame_width > s->avctx->width ||
+ frame_x + frame_width > s->avctx->width)
+ return;
+ if (frame_y < 0 || frame_height < 0 ||
+ frame_y >= s->avctx->height ||
+ frame_height > s->avctx->height ||
+ frame_y + frame_height > s->avctx->height)
+ return;
if ((frame_width == s->avctx->width && frame_height == s->avctx->height) &&
(frame_x || frame_y)) {