Add a deflate distance-code-31 test

This commit is contained in:
Nigel Tao committed 2019-02-02 13:04:09 +11:00
1 parent e9709992e2
commit 11a6819be9
8 files changed
+72 -2

No files matched your search

+10
View File
@@ -308,6 +308,16 @@ func stateDeflateFixedHuffman(line string) (stateFunc, error) {
return stateDeflateFixedHuffman, nil
}
if line == "len 3 distCode 31" {
lCode, lExtra, lNExtra := deflateEncodeLength(3)
g.stream.writeLCode(lCode)
g.stream.writeBits(lExtra, lNExtra)
dCode, dExtra, dNExtra := uint32(31), uint32(0), uint32(0)
g.stream.writeBits(reverse(dCode, 5), 5)
g.stream.writeBits(dExtra, dNExtra)
return stateDeflateFixedHuffman, nil
}
if l, d, ok := deflateParseLenDist(line); ok {
lCode, lExtra, lNExtra := deflateEncodeLength(l)
g.stream.writeLCode(lCode)
+3
View File
@@ -202,6 +202,9 @@ const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst,
if (i_err == Z_STREAM_END) {
break;
} else if (i_err == Z_DATA_ERROR) {
ret = "inflate failed (data error)";
goto cleanup1;
} else if (i_err != Z_OK) {
ret = "inflate failed";
goto cleanup1;
+31
View File
@@ -100,6 +100,13 @@ golden_test deflate_deflate_distance_32768_gt = {
"deflate-distance-32768.deflate",
};
golden_test deflate_deflate_distance_code_31_gt = {
.want_filename = "test/data/artificial/0.bytes",
.src_filename =
"test/data/artificial/"
"deflate-distance-code-31.deflate",
};
golden_test deflate_midsummer_gt = {
.want_filename = "test/data/midsummer.txt", //
.src_filename = "test/data/midsummer.txt.gz", //
@@ -177,6 +184,17 @@ const char* test_wuffs_deflate_decode_deflate_distance_32768() {
&deflate_deflate_distance_32768_gt, 0, 0);
}
const char* test_wuffs_deflate_decode_deflate_distance_code_31() {
CHECK_FOCUS(__func__);
const char* got = do_test_io_buffers(
wuffs_deflate_decode, &deflate_deflate_distance_code_31_gt, 0, 0);
if (got != wuffs_deflate__error__bad_huffman_code) {
RETURN_FAIL("got \"%s\", want \"%s\"", got,
wuffs_deflate__error__bad_huffman_code);
}
return NULL;
}
const char* test_wuffs_deflate_decode_midsummer() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(wuffs_deflate_decode, &deflate_midsummer_gt, 0, 0);
@@ -613,6 +631,17 @@ const char* test_mimic_deflate_decode_deflate_distance_32768() {
&deflate_deflate_distance_32768_gt, 0, 0);
}
const char* test_mimic_deflate_decode_deflate_distance_code_31() {
CHECK_FOCUS(__func__);
const char* got = do_test_io_buffers(
mimic_deflate_decode, &deflate_deflate_distance_code_31_gt, 0, 0);
const char* want = "inflate failed (data error)";
if ((got != want) && ((got == NULL) || (want == NULL) || strcmp(got, want))) {
RETURN_FAIL("got \"%s\", want \"%s\"", got, want);
}
return NULL;
}
const char* test_mimic_deflate_decode_midsummer() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode, &deflate_midsummer_gt, 0, 0);
@@ -705,6 +734,7 @@ proc tests[] = {
test_wuffs_deflate_decode_256_bytes, //
test_wuffs_deflate_decode_deflate_backref_crosses_blocks, //
test_wuffs_deflate_decode_deflate_distance_32768, //
test_wuffs_deflate_decode_deflate_distance_code_31, //
test_wuffs_deflate_decode_midsummer, //
test_wuffs_deflate_decode_pi_just_one_read, //
test_wuffs_deflate_decode_pi_many_big_reads, //
@@ -722,6 +752,7 @@ proc tests[] = {
test_mimic_deflate_decode_256_bytes, //
test_mimic_deflate_decode_deflate_backref_crosses_blocks, //
test_mimic_deflate_decode_deflate_distance_32768, //
test_mimic_deflate_decode_deflate_distance_code_31, //
test_mimic_deflate_decode_midsummer, //
test_mimic_deflate_decode_pi_just_one_read, //
test_mimic_deflate_decode_pi_many_big_reads, //
View File
Whitespace-only changes.
@@ -19,9 +19,7 @@ so the overall decoding is "abcdcdc".
000009 0x0009 . 0x03 0b_...._.011 Fixed Huffman block, final
000009 0x0009 . 0x03 0b_0000_0... lcode: 257 length: 3
000010 0x000A B 0x42 0b_...._..10
000010 0x000A B 0x42 0b_.100_00.. dcode: 1 distance: 2
000010 0x000A B 0x42 0b_0..._.... lcode: 256 end of block
000011 0x000B . 0x00 0b_..00_0000
@@ -0,0 +1 @@
~
@@ -0,0 +1,8 @@
Running deflate-distance-code-31.deflate through script/print-bits.go and
adding commentary:
offset xoffset ASCII hex binary
000000 0x0000 . 0x03 0b_...._.011 Fixed Huffman block, final
000000 0x0000 . 0x03 0b_0000_0... lcode: 257 length: 3
000001 0x0001 ~ 0x7E 0b_...._..10
000001 0x0001 ~ 0x7E 0b_.111_11.. dcode: 31 INVALID
@@ -0,0 +1,19 @@
# Feed this file to script/make-artificial.go
make deflate
# RFC 1951 section 3.2.6 says that for fixed Huffman codes, "distance codes
# 30-31 will never actually occur in the compressed data", and likewise for
# literal/length values 286-287.
#
# This dates from a more innocent time, before widespread concerns about
# malicious actors deliberately supplying invalid input to probe for security
# vulnerabilities. Upon encountering such input, a robust decoder shouldn't
# enter an internally inconsistent state.
#
# In terms of the Wuffs implementation (and error message convention), we
# should return an error, as it is indeed invalid input, but we shouldn't
# return an "internal error".
blockFixedHuffman (final) {
len 3 distCode 31
}