diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 20:18:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 00:35:12 +0100 |
| commit | 7855083443e059503731371d0eab011ae573708c (patch) | |
| tree | 87c2a08024b59bdc973618435a27ee38cec9772d | |
| parent | ca7f64e0ac205da95c9a113bd3b68956e9231b61 (diff) | |
| download | ffmpeg-7855083443e059503731371d0eab011ae573708c.tar.gz | |
dxa: check vectors of 4x4 motion blocks
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f96e0eb2387f8da7b8177f8f22969853dc648ca6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dxa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index a2fe5578df..97c30d5bd0 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -71,6 +71,11 @@ static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst, uint case 4: // motion compensation x = (*mv) >> 4; if(x & 8) x = 8 - x; y = (*mv++) & 0xF; if(y & 8) y = 8 - y; + if (i < -x || avctx->width - i - 4 < x || + j < -y || avctx->height - j - 4 < y) { + av_log(avctx, AV_LOG_ERROR, "MV %d %d out of bounds\n", x,y); + return AVERROR_INVALIDDATA; + } tmp2 += x + y*stride; case 0: // skip case 5: // skip in method 12 |