Let std/deflate decode a degenerate H-D table

This commit is contained in:
Nigel Tao committed 2019-09-28 13:23:49 +10:00
1 parent a9b9a82524
commit 15670546bb
4 files changed
+73 -27

No files matched your search

+10
View File
@@ -7205,6 +7205,16 @@ wuffs_deflate__decoder__init_huff(wuffs_deflate__decoder* self,
v_i += 1;
}
if (v_remaining != 0) {
if ((a_which == 1) && (v_counts[1] == 1) &&
(self->private_data.f_code_lengths[a_n_codes0] == 1) &&
((((uint32_t)(v_counts[0])) + a_n_codes0 + 1) == a_n_codes1)) {
self->private_impl.f_n_huffs_bits[1] = 1;
self->private_data.f_huffs[1][0] =
(wuffs_deflate__dcode_magic_numbers[0] | 1);
self->private_data.f_huffs[1][1] =
(wuffs_deflate__dcode_magic_numbers[31] | 1);
return NULL;
}
return wuffs_deflate__error__bad_huffman_code_under_subscribed;
}
v_i = 1;
+13 -3
View File
@@ -504,7 +504,7 @@ pri func decoder.init_dynamic_huffman?(src base.io_reader) {
// TODO: make named constants for 15, 19, 319, etc.
pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_codes1 base.u32[..320], base_symbol base.u32) base.status {
pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..288], n_codes1 base.u32[..320], base_symbol base.u32) base.status {
var counts array[16] base.u16[..320]
var i base.u32
var remaining base.u32
@@ -594,7 +594,18 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
i += 1
}
if remaining <> 0 {
// TODO: when is a degenerate Huffman table valid?
// As a special case, allow a degenerate H-D Huffman table, with only
// one 1-bit code, for the smallest possible distance.
if (args.which == 1) and (counts[1] == 1) and
(this.code_lengths[args.n_codes0] == 1) and
(((counts[0] as base.u32) + args.n_codes0 + 1) == args.n_codes1) {
this.n_huffs_bits[1] = 1
this.huffs[1][0] = dcode_magic_numbers[0] | 1
this.huffs[1][1] = dcode_magic_numbers[31] | 1
return ok
}
return "#bad Huffman code (under-subscribed)"
}
@@ -689,7 +700,6 @@ pri func decoder.init_huff!(which base.u32[..1], n_codes0 base.u32[..320], n_cod
break
}
if max_cl <= 1 {
// TODO: when is a degenerate Huffman table valid?
return "#no Huffman codes"
}
max_cl -= 1
+49 -24
View File
@@ -91,6 +91,15 @@ golden_test deflate_deflate_backref_crosses_blocks_gt = {
"deflate-backref-crosses-blocks.deflate",
};
golden_test deflate_deflate_degenerate_huffman_unused_gt = {
.want_filename =
"test/data/artificial/"
"deflate-degenerate-huffman-unused.deflate.decompressed",
.src_filename =
"test/data/artificial/"
"deflate-degenerate-huffman-unused.deflate",
};
golden_test deflate_deflate_distance_32768_gt = {
.want_filename =
"test/data/artificial/"
@@ -180,6 +189,13 @@ const char* test_wuffs_deflate_decode_deflate_backref_crosses_blocks() {
UINT64_MAX, UINT64_MAX);
}
const char* test_wuffs_deflate_decode_deflate_degenerate_huffman_unused() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(wuffs_deflate_decode,
&deflate_deflate_degenerate_huffman_unused_gt,
UINT64_MAX, UINT64_MAX);
}
const char* test_wuffs_deflate_decode_deflate_distance_32768() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(wuffs_deflate_decode,
@@ -638,6 +654,13 @@ const char* test_mimic_deflate_decode_deflate_backref_crosses_blocks() {
UINT64_MAX, UINT64_MAX);
}
const char* test_mimic_deflate_decode_deflate_degenerate_huffman_unused() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode,
&deflate_deflate_degenerate_huffman_unused_gt,
UINT64_MAX, UINT64_MAX);
}
const char* test_mimic_deflate_decode_deflate_distance_32768() {
CHECK_FOCUS(__func__);
return do_test_io_buffers(mimic_deflate_decode,
@@ -773,33 +796,35 @@ const char* bench_mimic_deflate_decode_100k_many_big_reads() {
// The empty comments forces clang-format to place one element per line.
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, //
test_wuffs_deflate_decode_pi_many_medium_reads, //
test_wuffs_deflate_decode_pi_many_small_writes_reads, //
test_wuffs_deflate_decode_romeo, //
test_wuffs_deflate_decode_romeo_fixed, //
test_wuffs_deflate_decode_split_src, //
test_wuffs_deflate_history_full, //
test_wuffs_deflate_history_partial, //
test_wuffs_deflate_table_redirect, //
test_wuffs_deflate_decode_256_bytes, //
test_wuffs_deflate_decode_deflate_backref_crosses_blocks, //
test_wuffs_deflate_decode_deflate_degenerate_huffman_unused, //
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, //
test_wuffs_deflate_decode_pi_many_medium_reads, //
test_wuffs_deflate_decode_pi_many_small_writes_reads, //
test_wuffs_deflate_decode_romeo, //
test_wuffs_deflate_decode_romeo_fixed, //
test_wuffs_deflate_decode_split_src, //
test_wuffs_deflate_history_full, //
test_wuffs_deflate_history_partial, //
test_wuffs_deflate_table_redirect, //
#ifdef WUFFS_MIMIC
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, //
test_mimic_deflate_decode_romeo, //
test_mimic_deflate_decode_romeo_fixed, //
test_mimic_deflate_decode_256_bytes, //
test_mimic_deflate_decode_deflate_backref_crosses_blocks, //
test_mimic_deflate_decode_deflate_degenerate_huffman_unused, //
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, //
test_mimic_deflate_decode_romeo, //
test_mimic_deflate_decode_romeo_fixed, //
#endif // WUFFS_MIMIC