diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 23:27:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 15:32:44 +0100 |
| commit | 84c84204b31287a6d3d911b564609cfaf29047b9 (patch) | |
| tree | fca75f436ea7ad089c2ac80137df39d04cb1ad65 | |
| parent | 683c92adde01a0e4e13d7419a81a151687523d92 (diff) | |
| download | ffmpeg-84c84204b31287a6d3d911b564609cfaf29047b9.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 e0f6e88aa6..cff0d499d2 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; |