diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-02 23:17:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-12-21 04:40:03 +0100 |
| commit | d44d87e172648ece39bb7328edf80577c66914db (patch) | |
| tree | 36bafd2be9f155575bf301d4294a1e5affcd9804 | |
| parent | 0872359f9fff2d7f404ad3b202bcd96517812c1b (diff) | |
avcodec/jpeglsdec: Check run value more completely in ls_decode_line()
previously it could have been by 1 too large
Fixes out of array access
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8c1e3.jls
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8nde0.jls
Fixes: asan_heap-oob_12240fa_1_asan_heap-oob_12240fa_448_t16e3.jls
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 06e7d58410a17dc72c30ee7f3145fcacc425f4f2)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/jpeglsdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 60bf569a1f..564a93f0cc 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -207,6 +207,11 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void * x += stride; } + if (x >= w) { + av_log(NULL, AV_LOG_ERROR, "run overflow\n"); + return; + } + /* decode run termination value */ Rb = R(last, x); RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0; |