diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 26e8654c..6e16f7a9 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2150,19 +2150,21 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE; goto exit; } - v_length = ((v_table_entry >> 8) & 32767); - v_table_entry_n_bits = ((v_table_entry >> 4) & 15); - while (v_n_bits < v_table_entry_n_bits) { + if (v_n_bits < 15) { { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { - goto short_read_src; - } uint8_t t_4 = *b_rptr_src++; v_bits |= (((uint32_t)(t_4)) << v_n_bits); } v_n_bits += 8; + { + uint8_t t_5 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_5)) << v_n_bits); + } + v_n_bits += 8; + } else { } + v_length = ((v_table_entry >> 8) & 32767); + v_table_entry_n_bits = ((v_table_entry >> 4) & 15); v_length = ((v_length + ((v_bits) & ((1 << (v_table_entry_n_bits)) - 1))) & 32767); @@ -2177,12 +2179,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( goto label_1_break; } { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_5 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_5)) << v_n_bits); + uint8_t t_6 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_6)) << v_n_bits); } v_n_bits += 8; } @@ -2206,12 +2208,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( goto label_2_break; } { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_6 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_6)) << v_n_bits); + uint8_t t_7 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_7)) << v_n_bits); } v_n_bits += 8; } @@ -2235,12 +2237,12 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_table_entry_n_bits = ((v_table_entry >> 4) & 15); while (v_n_bits < v_table_entry_n_bits) { { - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (PUFFS_BASE__UNLIKELY(b_rptr_src == b_rend_src)) { goto short_read_src; } - uint8_t t_7 = *b_rptr_src++; - v_bits |= (((uint32_t)(t_7)) << v_n_bits); + uint8_t t_8 = *b_rptr_src++; + v_bits |= (((uint32_t)(t_8)) << v_n_bits); } v_n_bits += 8; } @@ -2303,7 +2305,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( } } status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); } label_3_break:; if (v_hlen > 0) { @@ -2322,7 +2324,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_hlen -= v_n_copied; v_hdist = ((v_hdist + (v_n_copied & 32767)) & 32767); status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7); } label_4_break:; } @@ -2339,14 +2341,14 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( } v_length -= v_n_copied; status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8); } label_5_break:; } label_0_break:; while (v_n_bits >= 8) { v_n_bits -= 8; - PUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); + PUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); if (b_rptr_src == b_rstart_src) { status = PUFFS_FLATE__ERROR_INVALID_I_O_OPERATION; goto exit; diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index 3d1d1799..b7898043 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -151,19 +151,25 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { return error "internal error: inconsistent Huffman decoder state" } + // Ensure that we have at least 15 bits of input. + if n_bits < 15 { + assert n_bits >= 0 // TODO: this shouldn't be necessary. + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + bits |= (in.src.read_u8?() as u32) << n_bits + n_bits += 8 + assert n_bits >= 15 + } else { + assert in.src.available() >= 6 + } + // Once again, redundant but explicit assertions. - assert in.src.available() >= 8 + assert in.src.available() >= 6 + assert n_bits >= 15 // length = base number + extra bits. var length u32[..0x7FFF] = (table_entry >> 8) & 0x7FFF table_entry_n_bits = (table_entry >> 4) & 0x0F - while n_bits < table_entry_n_bits, - post n_bits >= table_entry_n_bits, - { - assert n_bits < 15 via "a < b: a < c; c <= b"(c:table_entry_n_bits) - bits |= (in.src.read_u8?() as u32) << n_bits - n_bits += 8 - } length = (length + bits.low_bits(n:table_entry_n_bits)) & 0x7FFF bits >>= table_entry_n_bits n_bits -= table_entry_n_bits