Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'

[ffmpeg] / libavcodec / jpeglsdec.c

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 09ddf07a961c49d70fa54413ac07267778c67206..97fc6007214b8ad0d3cef15cfca7492a36c1e9ac 100644 (file)
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -280,6 +280,7 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s,
 
             if (x >= w) {
                 av_log(NULL, AV_LOG_ERROR, "run overflow\n");
+                av_assert0(x <= w);
                 return;
             }