Check copy_from_history32's distance.

This commit is contained in:
Nigel Tao committed 2017-11-09 12:53:19 +11:00
1 parent 67fb7bf1dc
commit 30b54616a8
6 files changed
+52 -17

No files matched your search

+1
View File
@@ -28,6 +28,7 @@ pub error "checksum mismatch"
pub error "inconsistent stored block length"
pub error "internal error: inconsistent Huffman decoder state"
pub error "internal error: inconsistent Huffman end_of_block"
pub error "internal error: inconsistent distance"
pub error "internal error: inconsistent n_bits"
pub error "missing end-of-block code"
pub error "no Huffman codes"
+13
View File
@@ -268,6 +268,7 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
// its presence minimizes the diff between decode_huffman_fast and
// decode_huffman_slow.
while true,
pre in.dst.available() >= 258,
inv in.dst.is_marked(),
{
// Copy from this.history.
@@ -298,8 +299,12 @@ 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 in.dst.available() >= 258,
inv in.dst.is_marked(),
{
// TODO: copy_from_slice32 should probably update the
// "in.dst.available() >= 258" fact. It should certainly
// invalidate any fact that was "<=" instead of ">=".
n_copied = in.dst.copy_from_slice32(s:this.history[hdist:], length:hlen)
if hlen <= n_copied {
break
@@ -313,7 +318,15 @@ pri func flate_decoder.decode_huffman_fast?(dst writer1, src reader1)() {
// No need to copy from in.dst.
continue:loop
}
if (distance as u64) > in.dst.since_mark().length() {
return error "internal error: inconsistent distance"
}
}
// Once again, redundant but explicit assertions.
assert in.dst.available() >= 258
assert in.dst.is_marked()
assert (distance as u64) <= in.dst.since_mark().length()
// Copy from in.dst.
in.dst.copy_from_history32(distance:distance, length:length)