diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 21:08:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:48 +0100 |
| commit | e0ed766f2a4d6395e9633d350f39a175b9e9adc3 (patch) | |
| tree | f61c35693d7129da98446647074ec7fb9cb22d65 | |
| parent | 677da723005e0a40e4ab88cec7c001fbfc65955a (diff) | |
| download | ffmpeg-e0ed766f2a4d6395e9633d350f39a175b9e9adc3.tar.gz | |
avcodec/qpeg: fix off by 1 error in MV bounds check
Fixes out of array access
Fixes: asan_heap-oob_153760f_4_asan_heap-oob_1d7a4cf_164_VWbig6.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dd3bfe3cc1ca26d0fff3a3baf61a40207032143f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/qpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index d85d967a16..ac4f9a85d8 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -171,7 +171,7 @@ static void qpeg_decode_inter(const uint8_t *src, uint8_t *dst, int size, /* check motion vector */ if ((me_x + filled < 0) || (me_x + me_w + filled > width) || - (height - me_y - me_h < 0) || (height - me_y > orig_height) || + (height - me_y - me_h < 0) || (height - me_y >= orig_height) || (filled + me_w > width) || (height - me_h < 0)) av_log(NULL, AV_LOG_ERROR, "Bogus motion vector (%i,%i), block size %ix%i at %i,%i\n", me_x, me_y, me_w, me_h, filled, height); |