diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 23:27:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 16:25:20 +0100 |
| commit | 855fe6544792cc11c159119ce93434f2ad40dfa0 (patch) | |
| tree | c81bd00e4da44991705d2590ef970b487a54d44a | |
| parent | f83f09bfcef57e5ea871247ca2d6694dcdd04c0a (diff) | |
| download | ffmpeg-855fe6544792cc11c159119ce93434f2ad40dfa0.tar.gz | |
avcodec/jpeglsdec: check err value for ls_get_code_runterm()
Fixes infinite loop
Fixes Ticket3086
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeglsdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 879922a0e0..417bb4068d 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -142,6 +142,8 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI ret = ret >> 1; } + if(FFABS(ret) > 0xFFFF) + return -0x10000; /* update state */ state->A[Q] += FFABS(ret) - RItype; ret *= state->twonear; |