Add some more length and distance checks.

This commit is contained in:
Nigel Tao committed 2017-11-09 13:21:19 +11:00
1 parent 30b54616a8
commit 03acc15782
2 files changed
+37 -1

No files matched your search

+15
View File
@@ -2138,6 +2138,11 @@ label_0_continue:;
v_n_bits -= v_table_entry_n_bits;
} else {
}
if (v_length > 258) {
status =
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
if (v_n_bits < 15) {
{
uint8_t t_6 = *b_rptr_src++;
@@ -2213,6 +2218,11 @@ label_0_continue:;
v_bits >>= v_table_entry_n_bits;
v_n_bits -= v_table_entry_n_bits;
}
if (v_distance <= 0) {
status =
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_n_copied = 0;
while (true) {
if (((uint64_t)(v_distance)) >
@@ -2238,6 +2248,11 @@ label_0_continue:;
if (v_length > v_hdist) {
v_length -= v_hdist;
v_hlen = v_hdist;
if (v_length > 258) {
status =
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
} else {
v_hlen = v_length;
v_length = 0;
+22 -1
View File
@@ -182,6 +182,9 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
} else {
assert in.src.available() >= 6
}
if length > 258 {
return error "internal error: inconsistent Huffman decoder state"
}
// Ensure that we have at least 15 bits of input.
if n_bits < 15 {
@@ -262,12 +265,17 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
bits >>= table_entry_n_bits
n_bits -= table_entry_n_bits
}
if distance <= 0 {
return error "internal error: inconsistent Huffman decoder state"
}
var n_copied u32
// The "while true { etc; break }" is a redundant version of "etc", but
// its presence minimizes the diff between decode_huffman_fast and
// decode_huffman_slow.
while true,
pre length <= 258,
pre distance > 0,
pre in.dst.available() >= 258,
inv in.dst.is_marked(),
{
@@ -281,9 +289,14 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
if length > hdist {
length -= hdist
hlen = hdist
// TODO: this if check should be redundant.
if length > 258 {
return error "internal error: inconsistent Huffman decoder state"
}
} else {
hlen = length
length = 0
assert length <= 258
}
if this.history_index < hdist {
return error "bad distance"
@@ -299,6 +312,8 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
// "etc", but its presence minimizes the diff between
// decode_huffman_fast and decode_huffman_slow.
while true,
inv length <= 258,
inv distance > 0,
inv in.dst.available() >= 258,
inv in.dst.is_marked(),
{
@@ -324,9 +339,15 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
}
}
// Once again, redundant but explicit assertions.
assert length <= 258
assert distance > 0
assert (distance as u64) <= in.dst.since_mark().length()
assert in.dst.available() >= 258
assert in.dst.is_marked()
assert (distance as u64) <= in.dst.since_mark().length()
// We can therefore prove:
assert (length as u64) <= 258
assert (length as u64) <= in.dst.available() via "a <= b: a <= c; c <= b"(c:258)
// Copy from in.dst.
in.dst.copy_from_history32(distance:distance, length:length)