diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-18 20:57:27 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 06:40:35 +0300 |
| commit | 45509d0730e34423ccc637475a6db694fdf95341 (patch) | |
| tree | b9181ec0d595724840b9f53abda8576e1aa47736 | |
| parent | e78e2dc6e15d8699bf0b60299b0f7d5c20830c22 (diff) | |
avcodec/indeo3: ensure offsets are non negative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 368642361f3a589d7b0c23ea327d988edb434e3f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/indeo3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 85af6224e9..1f6d3420ad 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -988,7 +988,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(y_offset, v_offset, u_offset) < gb.buffer - bs_hdr + 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"); |