static inline unsigned read_huffman_symbol(const struct huffman_table* table,
struct bit_source* source)
{
- // FIXME: We can read past the end of the stream here in some edge
- // cases. We need to define some guarantees in the layers above.
possibly_refill(source, DEHUF_TABLE_BITS);
+ assert(source->bits_available >= DEHUF_TABLE_BITS);
unsigned lookup = peek_bits(source, DEHUF_TABLE_BITS);
int code = table->lookup_table_codes[lookup];
int length = table->lookup_table_length[lookup];
if (code == DEHUF_SLOW_PATH) {
return read_huffman_symbol_slow_path(table, source);
}
-
+
read_bits(source, length);
return code;
}