diff mbox

[FFmpeg-devel,2/2] avcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()

Message ID 20171025220257.7790-2-michael@niedermayer.cc
State Accepted
Commit f80224ed19a4c012549fd460d529c7c04e68cf21
Headers show

Commit Message

Michael Niedermayer Oct. 25, 2017, 10:02 p.m. UTC 
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>
---
 libavcodec/jpeglsdec.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index cb2f89a88c..5308b744df 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -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);