diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-05-06 22:40:25 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2015-05-06 22:40:25 +0000 |
| commit | 1d92fb0cbcace5a514a4201ac3f22df8d4faab04 (patch) | |
| tree | 72aaf65f64eec7915add7d2208edabc117227f1e | |
| parent | fe906919472ac45837ea1776795f42cc62d673ab (diff) | |
Fix a bug in the 64-bit Huffman encoder that Google discovered when encoding some very specific (and proprietary) aerial images using quality=98, an optimized Huffman table, and the ISLOW DCT. These images were causing the Huffman bit buffer to overflow, because the code for encoding the DC coefficient was using the equivalent of the 32-bit version of EMIT_BITS(). Thus, when 64-bit code was used, the DC coefficient code was not properly checking how many bits were in the buffer before attempting to add more bits to it. This issue appears to have existed in all versions of libjpeg-turbo.HEADmaster
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1546 632fc199-4ca6-4c93-a231-07263d6284db
| -rw-r--r-- | ChangeLog.txt | 5 | ||||
| -rw-r--r-- | jchuff.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index f92e4d9..979d802 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -48,6 +48,11 @@ h2v2 merged upsampling were not properly checking for the existence of DSPr2. version of the accelerated Huffman codec was not being compiled in when libjpeg-turbo was built on OS X. Oops. +[7] Fixed an extremely rare bug in the Huffman encoder that caused 64-bit +builds of libjpeg-turbo to incorrectly encode a few specific test images when +quality=98, an optimized Huffman table, and the slow integer forward DCT were +used. + 1.4.0 ===== @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1997, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2009-2011, 2014 D. R. Commander. + * Copyright (C) 2009-2011, 2014-2015 D. R. Commander. * For conditions of distribution and use, see the accompanying README file. * * This file contains Huffman entropy encoding routines. @@ -520,16 +520,14 @@ encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val, /* Emit the Huffman-coded symbol for the number of bits */ code = dctbl->ehufco[nbits]; size = dctbl->ehufsi[nbits]; - PUT_BITS(code, size) - CHECKBUF15() + EMIT_BITS(code, size) /* Mask off any extra bits in code */ temp2 &= (((INT32) 1)<<nbits) - 1; /* Emit that number of bits of the value, if positive, */ /* or the complement of its magnitude, if negative. */ - PUT_BITS(temp2, nbits) - CHECKBUF15() + EMIT_BITS(temp2, nbits) /* Encode the AC coefficients per section F.1.2.2 */ |