X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmjpegdec.c;h=78a0453d57f693c1e5f1b1152acec3d3733c7106;hb=2dc9bcad7d57f70181ffa5c1804d1426afb50346;hp=78af858695f0e58daad6cfbabf6f94d58aafcec4;hpb=ac6e074fb711468a2ff3f241a1641dc5b34b386d;p=ffmpeg

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 78af858695f..78a0453d57f 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1590,7 +1590,7 @@ int ff_mjpeg_find_marker(MJpegDecodeContext *s,
                 while ((src + t < buf_end) && x == 0xff)
                     x = src[t++];
                 if (x & 0x80) {
-                    t -= 2;
+                    t -= FFMIN(2, t);
                     break;
                 }
             }