[FFmpeg-cvslog] avcodec/indeo3: ensure offsets are non negative

[Michael Niedermayer]

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 18 18:57:27 2014 +0100| [c60caa5769b89ab7dc4aa41a21f87d5ee177bd30] | committer: Michael Niedermayer

avcodec/indeo3: ensure offsets are non negative

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 368642361f3a589d7b0c23ea327d988edb434e3f)

Conflicts:

	libavcodec/indeo3.c

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

 libavcodec/indeo3.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index da7dd83..48f1866 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -978,7 +978,8 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
     ctx->y_data_size = ends[0] - starts[0];
     ctx->v_data_size = ends[1] - starts[1];
     ctx->u_data_size = ends[2] - starts[2];
-    if (FFMAX3(y_offset, v_offset, u_offset) >= ctx->data_size - 16 ||
+    if (FFMIN3(y_offset, v_offset, u_offset) < 0 ||
+        FFMAX3(y_offset, v_offset, u_offset) >= ctx->data_size - 16 ||
         FFMIN3(ctx->y_data_size, ctx->v_data_size, ctx->u_data_size) <= 0) {
         av_log(avctx, AV_LOG_ERROR, "One of the y/u/v offsets is invalid\n");
         return AVERROR_INVALIDDATA;