This is subtle, but an unread marker is not an error unless we run out of bits, which...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@583 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/jdhuff.c b/jdhuff.c
index ad1112ec91928fb13d614d66c8cb3957305cf4c6..b795462f4928632b950af2d772070026bbdaa47b 100644 (file)
--- a/jdhuff.c
+++ b/jdhuff.c
@@ -784,7 +784,8 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
     usefast = 0;
   }
 
-  if (cinfo->src->bytes_in_buffer < BUFSIZE * cinfo->blocks_in_MCU)
+  if (cinfo->src->bytes_in_buffer < BUFSIZE * cinfo->blocks_in_MCU
+    || cinfo->unread_marker != 0)
     usefast = 0;
 
   /* If we've run out of data, just leave the MCU set to zeroes.