ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data corruption issues when decompressing large JPEG images and/or using buffered I/O. Specifically, decode_mcu_fast() can potentially process more than 1 MCU, so make sure there is enough space in the buffer to accommodate this case. Otherwise, the buffer pointer goes negative, and bad mojo ensues. Also, the fast decoder's method of handling unread markers doesn't make libjpeg's restart handler happy, so disable fast decode when restarts are used.

Browse Source
This commit is contained in:
DRC
2010-03-15 11:34:58 +00:00
parent 56e1973681
commit c6838b243e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jdhuff.c
View File

@@ -778,7 +778,8 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
*/ */
if (! entropy->pub.insufficient_data) { if (! entropy->pub.insufficient_data) {
if (cinfo->src->bytes_in_buffer >= BUFSIZE) { if (cinfo->src->bytes_in_buffer >= BUFSIZE * cinfo->blocks_in_MCU
&& !cinfo->restart_interval) {
if (!decode_mcu_fast(cinfo, MCU_data)) return FALSE; if (!decode_mcu_fast(cinfo, MCU_data)) return FALSE;
} }
else { else {