From: Luca Barbato <lu_zero@gentoo.org>
Date: Sun, 30 Jun 2013 08:35:07 +0000 (+0200)
Subject: indeo5: reject negative motion vectors
X-Git-Tag: android-x86-4.4-r1~364^2~793
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1194a410807bac3eafbeb632578b937656d273e7;p=android-x86%2Fexternal-ffmpeg.git

indeo5: reject negative motion vectors

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
---

diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index dc5f6f09ad..7a60f49621 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -520,6 +520,12 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band,
                         mv_x += IVI_TOSIGNED(mv_delta);
                         mb->mv_x = mv_x;
                         mb->mv_y = mv_y;
+                        if (mv_x < 0 || mv_y < 0) {
+                            av_log(avctx, AV_LOG_ERROR, "Invalid MV %d %d\n",
+                                   mv_x, mv_y);
+                            mb->mv_x = mb->mv_y = 0;
+                            return AVERROR_INVALIDDATA;
+                        }
                     }
                 }
             }