Fix std/deflate degenerate H-D Huffman table

RFC 1951 section 3.2.7. "Compression with dynamic Huffman codes
(BTYPE=10)" says, "If only one distance code is used, it is encoded
using one bit, not zero bits; in this case there is a single code length
of one, with one unused code."

I had previously mis-read that excerpt to also require that the sole
distance code was the shortest distance (code 0, a distance of 1).

Fixes #66
This commit is contained in:
Nigel Tao committed 2022-01-08 13:57:34 +11:00
1 parent dda01f1a77
commit f86c80e425
7 files changed
+75 -28

No files matched your search

+8 -8
View File
@@ -587,20 +587,20 @@ func stateDeflateDynamicHuffman(line string) (stateFunc, error) {
return stateDeflateDynamicHuffman, nil
} else if l, d, ok := deflateParseLenDist(line); ok {
if (l != 3) || (d != 2) {
return nil, fmt.Errorf("TODO: support len/dist pairs for dynamic Huffman blocks")
if (l > 10) || (d > 4) {
return nil, fmt.Errorf("TODO: support len/dist ExtraBits > 0 for dynamic Huffman blocks")
}
// len 3 is code 257, with no extra bits.
if s := g.huffmans[2][257]; s != "" {
// len 3 is code 257, len 4 is code 258, etc. All with no ExtraBits.
if s := g.huffmans[2][l+254]; s != "" {
deflateGlobalsWriteDynamicHuffmanBits(s)
} else {
return nil, fmt.Errorf("no code for literal/length symbol 257")
return nil, fmt.Errorf("no code for literal/length symbol %d", l+254)
}
// dist 2 is code 1, with no extra bits.
if s := g.huffmans[3][1]; s != "" {
// dist 1 is code 0, dist 2 is code 1, etc. All with no ExtraBits.
if s := g.huffmans[3][d-1]; s != "" {
deflateGlobalsWriteDynamicHuffmanBits(s)
} else {
return nil, fmt.Errorf("no code for distance symbol 2")
return nil, fmt.Errorf("no code for distance symbol %d", d-1)
}
return stateDeflateDynamicHuffman, nil