diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 81c8c552..13860ce8 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -2036,7 +2036,7 @@ static puffs_flate__status puffs_flate__flate_decoder__decode_huffman_fast( v_lmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[0]) - 1); v_dmask = ((((uint32_t)(1)) << self->private_impl.f_n_huffs_bits[1]) - 1); label_0_continue:; - while (((uint64_t)(b_rend_src - b_rptr_src)) >= 6) { + while (((uint64_t)(b_rend_src - b_rptr_src)) >= 12) { if (v_n_bits < 15) { { uint8_t t_0 = *b_rptr_src++; diff --git a/std/flate/decode_huffman_fast.puffs b/std/flate/decode_huffman_fast.puffs index fc362425..7d682acf 100644 --- a/std/flate/decode_huffman_fast.puffs +++ b/std/flate/decode_huffman_fast.puffs @@ -30,7 +30,24 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { var lmask u32[..511] = ((1 as u32) << this.n_huffs_bits[0]) - 1 var dmask u32[..511] = ((1 as u32) << this.n_huffs_bits[1]) - 1 - while:loop in.src.available() >= 6 { + // Strictly speaking, we only need 6 bytes (48 bits) of available input, + // because the H-L length/literal code is up to 15 bits plus up to 5 extra + // bits, the H-D distance code is up to 15 bits plus up to 13 extra bits + // and 15 + 5 + 15 + 13 == 48. However, in.src.available() assertions are + // made in terms of bytes, not bits. + // + // In theory, we could write assertions that mixed bytes and bits, such as: + // + // assert ((in.src.available() >= 6) and (n_bits >= 5)) or + // ((in.src.available() >= 4) and (n_bits >= 21)) + // + // but that looks clumsy and makes the proofs more complicated. Instead, we + // are conservative and work in terms of bytes only. In bytes, each code + // requires either one (direct) or two (redirect) lookups, up to 2 bytes + // for each. There are also up to 13 extra bits, or 2 bytes. Thus, each + // code requires up to 2 + 2 + 2 == 6 bytes, and there are two codes (one + // from H-L and one from H-D). Therefore, we check for at least 12 bytes. + while:loop in.src.available() >= 12 { // Ensure that we have at least 15 bits of input. if n_bits < 15 { assert n_bits >= 0 // TODO: this shouldn't be necessary. @@ -40,13 +57,13 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() { n_bits += 8 assert n_bits >= 15 } else { - assert in.src.available() >= 4 + assert in.src.available() >= 10 } // These assertions are redundant, but are listed explicitly for // clarity. They must hold regardless of which branch was taken for the // if statement above. - assert in.src.available() >= 4 + assert in.src.available() >= 10 assert n_bits >= 15 // Decode an lcode symbol from H-L.