diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ec720425..48425223 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6336,6 +6336,10 @@ static const uint32_t // wuffs_deflate__huffs_table_size // WUFFS_BASE__POTENTIALLY_UNUSED = 1024; +static const uint32_t // + wuffs_deflate__huffs_table_mask // + WUFFS_BASE__POTENTIALLY_UNUSED = 1023; + // ---------------- Private Initializer Prototypes // ---------------- Private Function Prototypes @@ -7504,13 +7508,9 @@ label_0_continue:; } v_redir_top = ((v_table_entry >> 8) & 65535); v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); - if ((v_redir_top + (v_bits & v_redir_mask)) >= 1024) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } - v_table_entry = self->private_data - .f_huffs[0][(v_redir_top + (v_bits & v_redir_mask))]; + v_table_entry = + self->private_data + .f_huffs[0][((v_redir_top + (v_bits & v_redir_mask)) & 1023)]; v_table_entry_n_bits = (v_table_entry & 15); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; @@ -7589,13 +7589,9 @@ label_0_continue:; } v_redir_top = ((v_table_entry >> 8) & 65535); v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); - if ((v_redir_top + (v_bits & v_redir_mask)) >= 1024) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } - v_table_entry = self->private_data - .f_huffs[1][(v_redir_top + (v_bits & v_redir_mask))]; + v_table_entry = + self->private_data + .f_huffs[1][((v_redir_top + (v_bits & v_redir_mask)) & 1023)]; v_table_entry_n_bits = (v_table_entry & 15); v_bits >>= v_table_entry_n_bits; v_n_bits -= v_table_entry_n_bits; @@ -7838,14 +7834,9 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, v_redir_top = ((v_table_entry >> 8) & 65535); v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); while (true) { - if ((v_redir_top + (v_bits & v_redir_mask)) >= 1024) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } v_table_entry = self->private_data - .f_huffs[0][(v_redir_top + (v_bits & v_redir_mask))]; + .f_huffs[0][((v_redir_top + (v_bits & v_redir_mask)) & 1023)]; v_table_entry_n_bits = (v_table_entry & 15); if (v_n_bits >= v_table_entry_n_bits) { v_bits >>= v_table_entry_n_bits; @@ -7946,14 +7937,9 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, v_redir_top = ((v_table_entry >> 8) & 65535); v_redir_mask = ((((uint32_t)(1)) << ((v_table_entry >> 4) & 15)) - 1); while (true) { - if ((v_redir_top + (v_bits & v_redir_mask)) >= 1024) { - status = - wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state; - goto exit; - } v_table_entry = self->private_data - .f_huffs[1][(v_redir_top + (v_bits & v_redir_mask))]; + .f_huffs[1][((v_redir_top + (v_bits & v_redir_mask)) & 1023)]; v_table_entry_n_bits = (v_table_entry & 15); if (v_n_bits >= v_table_entry_n_bits) { v_bits >>= v_table_entry_n_bits; diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index d5dd5dd9..a91e9b78 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -60,6 +60,7 @@ pri const dcode_magic_numbers array[32] base.u32 = [ // TODO: replace the magic "big enough" 1024 with something more principled, // perhaps discovered via an exhaustive search. pri const huffs_table_size base.u32 = 1024 +pri const huffs_table_mask base.u32 = 1023 pub struct decoder?( // These fields yield src's bits in Least Significant Bits order. diff --git a/std/deflate/decode_huffman_fast.wuffs b/std/deflate/decode_huffman_fast.wuffs index a4593739..d98af1ce 100644 --- a/std/deflate/decode_huffman_fast.wuffs +++ b/std/deflate/decode_huffman_fast.wuffs @@ -130,11 +130,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba redir_top = (table_entry >> 8) & 0xFFFF redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1 - if (redir_top + (bits & redir_mask)) >= huffs_table_size { - return "#internal error: inconsistent Huffman decoder state" - } - assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size) - table_entry = this.huffs[0][redir_top + (bits & redir_mask)] + table_entry = this.huffs[0][(redir_top + (bits & redir_mask)) & huffs_table_mask] table_entry_n_bits = table_entry & 0x0F bits >>= table_entry_n_bits n_bits -= table_entry_n_bits @@ -244,11 +240,7 @@ pri func decoder.decode_huffman_fast!(dst base.io_writer, src base.io_reader) ba redir_top = (table_entry >> 8) & 0xFFFF redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1 - if (redir_top + (bits & redir_mask)) >= huffs_table_size { - return "#internal error: inconsistent Huffman decoder state" - } - assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size) - table_entry = this.huffs[1][redir_top + (bits & redir_mask)] + table_entry = this.huffs[1][(redir_top + (bits & redir_mask)) & huffs_table_mask] table_entry_n_bits = table_entry & 0x0F bits >>= table_entry_n_bits n_bits -= table_entry_n_bits diff --git a/std/deflate/decode_huffman_slow.wuffs b/std/deflate/decode_huffman_slow.wuffs index 39385fa1..2fb085f9 100644 --- a/std/deflate/decode_huffman_slow.wuffs +++ b/std/deflate/decode_huffman_slow.wuffs @@ -79,11 +79,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) { redir_top = (table_entry >> 8) & 0xFFFF redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1 while true { - if (redir_top + (bits & redir_mask)) >= huffs_table_size { - return "#internal error: inconsistent Huffman decoder state" - } - assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size) - table_entry = this.huffs[0][redir_top + (bits & redir_mask)] + table_entry = this.huffs[0][(redir_top + (bits & redir_mask)) & huffs_table_mask] table_entry_n_bits = table_entry & 0x0F if n_bits >= table_entry_n_bits { bits >>= table_entry_n_bits @@ -161,11 +157,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) { redir_top = (table_entry >> 8) & 0xFFFF redir_mask = ((1 as base.u32) << ((table_entry >> 4) & 0x0F)) - 1 while true { - if (redir_top + (bits & redir_mask)) >= huffs_table_size { - return "#internal error: inconsistent Huffman decoder state" - } - assert (redir_top + (bits & redir_mask)) < 1024 via "a < b: a < c; c <= b"(c:huffs_table_size) - table_entry = this.huffs[1][redir_top + (bits & redir_mask)] + table_entry = this.huffs[1][(redir_top + (bits & redir_mask)) & huffs_table_mask] table_entry_n_bits = table_entry & 0x0F if n_bits >= table_entry_n_bits { bits >>= table_entry_n_bits