[FFmpeg-cvslog] avcodec/jpeglsdec: check err value for ls_get_code_runterm()
Michael Niedermayer
git at videolan.org
Thu Jan 16 02:46:54 CET 2014
ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 23:27:28 2013 +0100| [751e684aae1e44799bd2ed0dcc93f4ecf9db4b53] | committer: Michael Niedermayer
avcodec/jpeglsdec: check err value for ls_get_code_runterm()
Fixes infinite loop
Fixes Ticket3086
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=751e684aae1e44799bd2ed0dcc93f4ecf9db4b53
---
libavcodec/jpeglsdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 516a82f..10fe31a 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;
More information about the ffmpeg-cvslog
mailing list