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

Throw a warning if an unexpected marker is found in the middle of the JPEG data stream

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@522 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-03-18 05:44:27 +00:00
parent 1f014c32e6 df1c38df74
commit 60de06ef7a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jdhuff.c
View File

@@ -623,6 +623,7 @@ decode_mcu_slow (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
if (val0 == 0xFF) { \ if (val0 == 0xFF) { \
buffer++; \ buffer++; \
if (val1 != 0) { \ if (val1 != 0) { \
cinfo->unread_marker = val1; \
buffer -= 2; \ buffer -= 2; \
get_buffer &= ~0xFF; \ get_buffer &= ~0xFF; \
} \ } \
@@ -739,6 +740,11 @@ decode_mcu_fast (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
} }
} }
if (cinfo->unread_marker != 0 && ! cinfo->entropy->insufficient_data) {
WARNMS(cinfo, JWRN_HIT_MARKER);
cinfo->entropy->insufficient_data = TRUE;
}
br_state.bytes_in_buffer -= (buffer - br_state.next_input_byte); br_state.bytes_in_buffer -= (buffer - br_state.next_input_byte);
br_state.next_input_byte = buffer; br_state.next_input_byte = buffer;
BITREAD_SAVE_STATE(cinfo,entropy->bitstate); BITREAD_SAVE_STATE(cinfo,entropy->bitstate);