X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=dehuff.h;h=a6a431a8139440a7052ce1dadd39b182ee5566b4;hp=7618bfd6b5e5e8a31f6907ffd5089400d2e1bb56;hb=9069ae93f3e9e9b44f5f28968f508d09f0711737;hpb=91f2e505234fbf8d8afbdcf1f62b3630da820262;ds=sidebyside

diff --git a/dehuff.h b/dehuff.h
index 7618bfd..a6a431a 100644
--- a/dehuff.h
+++ b/dehuff.h
@@ -51,9 +51,8 @@ unsigned read_huffman_symbol_slow_path(const struct huffman_table* table,
 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];
@@ -61,7 +60,7 @@ static inline unsigned read_huffman_symbol(const struct huffman_table* table,
 	if (code == DEHUF_SLOW_PATH) {
 		return read_huffman_symbol_slow_path(table, source);
 	}
-
+		
 	read_bits(source, length);
 	return code;
 }
@@ -72,7 +71,7 @@ static inline unsigned read_huffman_symbol(const struct huffman_table* table,
 // The table actually helps, since the load can go in parallel with the shift
 // operation below.
 static const int bit_thresholds[16] = {
-	0, 1 << 0, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7, 1 << 8, 1 << 9, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15
+	0, 1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7, 1 << 8, 1 << 9, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14
 };
 
 static inline unsigned extend(int val, int bits)
@@ -84,5 +83,4 @@ static inline unsigned extend(int val, int bits)
 	}
 }
 
-
 #endif /* !defined(_DEHUFF_H) */