avcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 25 Oct 2017 22:02:57 +0000 (00:02 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 8 Jan 2018 22:19:14 +0000 (23:19 +0100)
Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760

Fixes: Timeout

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f80224ed19a4c012549fd460d529c7c04e68cf21)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/jpeglsdec.c

index 60701d6..5e0a3d2 100644 (file)
@@ -233,6 +233,9 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s,
     while (x < w) {
         int err, pred;
 
+        if (get_bits_left(&s->gb) <= 0)
+            return;
+
         /* compute gradients */
         Ra = x ? R(dst, x - stride) : R(last, x);
         Rb = R(last, x);