Version 5.22 introduced a new option to /etc/containers/policy.json called
keyPaths, see
https://github.com/containers/image/pull/1609
EL9 immediately took advantage of this new feature and started using it, see
04645c4a84
This quickly became an issue in our code: The go library (containers/image)
parses the configuration file very strictly and refuses to create a client
when policy.json with an unknown key is present on the filesystem. As we
used 5.21.1 that doesn't know the new key, our unit tests started to
failing when containers-common was present.
Reproducer:
podman run --pull=always --rm -it centos:stream9
dnf install -y dnf-plugins-core
dnf config-manager --set-enabled crb
dnf install -y gpgme-devel libassuan-devel krb5-devel golang git-core
git clone https://github.com/osbuild/osbuild-composer
cd osbuild-composer
# install the new containers-common and run the test
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/44.el9/x86_64/containers-common-1-44.el9.x86_64.rpm
go test -count 1 ./...
# this returns:
--- FAIL: TestClientResolve (0.00s)
client_test.go:31:
Error Trace: client_test.go:31
Error: Received unexpected error:
Unknown key "keyPaths"
invalid policy in "/etc/containers/policy.json"
github.com/containers/image/v5/signature.NewPolicyFromFile
/osbuild-composer/vendor/github.com/containers/image/v5/signature/policy_config.go:88
github.com/osbuild/osbuild-composer/internal/container.NewClient
/osbuild-composer/internal/container/client.go:123
github.com/osbuild/osbuild-composer/internal/container_test.TestClientResolve
/osbuild-composer/internal/container/client_test.go:29
testing.tRunner
/usr/lib/golang/src/testing/testing.go:1439
runtime.goexit
/usr/lib/golang/src/runtime/asm_amd64.s:1571
Test: TestClientResolve
client_test.go:32:
Error Trace: client_test.go:32
Error: Expected value not to be nil.
Test: TestClientResolve
When run with an older containers-common, it succeeds:
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/40.el9/x86_64/containers-common-1-40.el9.x86_64.rpm
go test -count 1 ./...
PASS
To sum it up, I had to upgrade github.com/containers/image/v5 to v5.22.0.
Unfortunately, this wasn't so simple, see
go get github.com/containers/image/v5@latest
go: github.com/containers/image/v5@v5.22.0 requires
github.com/letsencrypt/boulder@v0.0.0-20220331220046-b23ab962616e requires
github.com/honeycombio/beeline-go@v1.1.1 requires
github.com/gobuffalo/pop/v5@v5.3.1 requires
github.com/mattn/go-sqlite3@v2.0.3+incompatible: reading github.com/mattn/go-sqlite3/go.mod at revision v2.0.3: unknown revision v2.0.3
It turns out that github.com/mattn/go-sqlite3@v2.0.3+incompatible has been
recently retracted https://github.com/mattn/go-sqlite3/pull/998 and this
broke a ton of packages depending on it. I was able to fix it by adding
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
to our go.mod, see
https://github.com/mattn/go-sqlite3/issues/975#issuecomment-955661657
After adding it,
go get github.com/containers/image/v5@latest
succeeded and tools/prepare-source.sh took care of the rest.
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
1283 lines
32 KiB
Go
1283 lines
32 KiB
Go
// Code generated by go generate gen_inflate.go. DO NOT EDIT.
|
|
|
|
package flate
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"fmt"
|
|
"math/bits"
|
|
"strings"
|
|
)
|
|
|
|
// Decode a single Huffman block from f.
|
|
// hl and hd are the Huffman states for the lit/length values
|
|
// and the distance values, respectively. If hd == nil, using the
|
|
// fixed distance encoding associated with fixed Huffman blocks.
|
|
func (f *decompressor) huffmanBytesBuffer() {
|
|
const (
|
|
stateInit = iota // Zero value must be stateInit
|
|
stateDict
|
|
)
|
|
fr := f.r.(*bytes.Buffer)
|
|
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
fnb, fb, dict := f.nb, f.b, &f.dict
|
|
|
|
switch f.stepState {
|
|
case stateInit:
|
|
goto readLiteral
|
|
case stateDict:
|
|
goto copyHistory
|
|
}
|
|
|
|
readLiteral:
|
|
// Read literal and/or (length, distance) according to RFC section 3.2.3.
|
|
{
|
|
var v int
|
|
{
|
|
// Inlined v, err := f.huffSym(f.hl)
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hl.maxRead)
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hl.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var length int
|
|
switch {
|
|
case v < 256:
|
|
dict.writeByte(byte(v))
|
|
if dict.availWrite() == 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesBuffer
|
|
f.stepState = stateInit
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.b, f.nb = fb, fnb
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
case v < maxNumLit:
|
|
val := decCodeToLen[(v - 257)]
|
|
length = int(val.length) + 3
|
|
n := uint(val.extra)
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
length += int(fb & bitMask32[n])
|
|
fb >>= n & regSizeMaskUint32
|
|
fnb -= n
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for fnb < 5 {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(fb & 0x1F << 3)))
|
|
fb >>= 5
|
|
fnb -= 5
|
|
} else {
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hd.maxRead)
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hd.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hd.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hd.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
dist = uint32(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case dist < 4:
|
|
dist++
|
|
case dist < maxNumDist:
|
|
nb := uint(dist-2) >> 1
|
|
// have 1 bit in bottom of dist, need nb more.
|
|
extra := (dist & 1) << (nb & regSizeMaskUint32)
|
|
for fnb < nb {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
extra |= fb & bitMask32[nb]
|
|
fb >>= nb & regSizeMaskUint32
|
|
fnb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
// slower: dist = bitMask32[nb+1] + 2 + extra
|
|
default:
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist too big:", dist, maxNumDist)
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
// No check on length; encoding can be prescient.
|
|
if dist > uint32(dict.histSize()) {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist > dict.histSize():", dist, dict.histSize())
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
f.copyLen, f.copyDist = length, int(dist)
|
|
goto copyHistory
|
|
}
|
|
|
|
copyHistory:
|
|
// Perform a backwards copy according to RFC section 3.2.3.
|
|
{
|
|
cnt := dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesBuffer // We need to continue this work
|
|
f.stepState = stateDict
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
// Not reached
|
|
}
|
|
|
|
// Decode a single Huffman block from f.
|
|
// hl and hd are the Huffman states for the lit/length values
|
|
// and the distance values, respectively. If hd == nil, using the
|
|
// fixed distance encoding associated with fixed Huffman blocks.
|
|
func (f *decompressor) huffmanBytesReader() {
|
|
const (
|
|
stateInit = iota // Zero value must be stateInit
|
|
stateDict
|
|
)
|
|
fr := f.r.(*bytes.Reader)
|
|
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
fnb, fb, dict := f.nb, f.b, &f.dict
|
|
|
|
switch f.stepState {
|
|
case stateInit:
|
|
goto readLiteral
|
|
case stateDict:
|
|
goto copyHistory
|
|
}
|
|
|
|
readLiteral:
|
|
// Read literal and/or (length, distance) according to RFC section 3.2.3.
|
|
{
|
|
var v int
|
|
{
|
|
// Inlined v, err := f.huffSym(f.hl)
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hl.maxRead)
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hl.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var length int
|
|
switch {
|
|
case v < 256:
|
|
dict.writeByte(byte(v))
|
|
if dict.availWrite() == 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesReader
|
|
f.stepState = stateInit
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.b, f.nb = fb, fnb
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
case v < maxNumLit:
|
|
val := decCodeToLen[(v - 257)]
|
|
length = int(val.length) + 3
|
|
n := uint(val.extra)
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
length += int(fb & bitMask32[n])
|
|
fb >>= n & regSizeMaskUint32
|
|
fnb -= n
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for fnb < 5 {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(fb & 0x1F << 3)))
|
|
fb >>= 5
|
|
fnb -= 5
|
|
} else {
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hd.maxRead)
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hd.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hd.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hd.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
dist = uint32(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case dist < 4:
|
|
dist++
|
|
case dist < maxNumDist:
|
|
nb := uint(dist-2) >> 1
|
|
// have 1 bit in bottom of dist, need nb more.
|
|
extra := (dist & 1) << (nb & regSizeMaskUint32)
|
|
for fnb < nb {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
extra |= fb & bitMask32[nb]
|
|
fb >>= nb & regSizeMaskUint32
|
|
fnb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
// slower: dist = bitMask32[nb+1] + 2 + extra
|
|
default:
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist too big:", dist, maxNumDist)
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
// No check on length; encoding can be prescient.
|
|
if dist > uint32(dict.histSize()) {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist > dict.histSize():", dist, dict.histSize())
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
f.copyLen, f.copyDist = length, int(dist)
|
|
goto copyHistory
|
|
}
|
|
|
|
copyHistory:
|
|
// Perform a backwards copy according to RFC section 3.2.3.
|
|
{
|
|
cnt := dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
// Not reached
|
|
}
|
|
|
|
// Decode a single Huffman block from f.
|
|
// hl and hd are the Huffman states for the lit/length values
|
|
// and the distance values, respectively. If hd == nil, using the
|
|
// fixed distance encoding associated with fixed Huffman blocks.
|
|
func (f *decompressor) huffmanBufioReader() {
|
|
const (
|
|
stateInit = iota // Zero value must be stateInit
|
|
stateDict
|
|
)
|
|
fr := f.r.(*bufio.Reader)
|
|
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
fnb, fb, dict := f.nb, f.b, &f.dict
|
|
|
|
switch f.stepState {
|
|
case stateInit:
|
|
goto readLiteral
|
|
case stateDict:
|
|
goto copyHistory
|
|
}
|
|
|
|
readLiteral:
|
|
// Read literal and/or (length, distance) according to RFC section 3.2.3.
|
|
{
|
|
var v int
|
|
{
|
|
// Inlined v, err := f.huffSym(f.hl)
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hl.maxRead)
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hl.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var length int
|
|
switch {
|
|
case v < 256:
|
|
dict.writeByte(byte(v))
|
|
if dict.availWrite() == 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBufioReader
|
|
f.stepState = stateInit
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.b, f.nb = fb, fnb
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
case v < maxNumLit:
|
|
val := decCodeToLen[(v - 257)]
|
|
length = int(val.length) + 3
|
|
n := uint(val.extra)
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
length += int(fb & bitMask32[n])
|
|
fb >>= n & regSizeMaskUint32
|
|
fnb -= n
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for fnb < 5 {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(fb & 0x1F << 3)))
|
|
fb >>= 5
|
|
fnb -= 5
|
|
} else {
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hd.maxRead)
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hd.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hd.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hd.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
dist = uint32(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case dist < 4:
|
|
dist++
|
|
case dist < maxNumDist:
|
|
nb := uint(dist-2) >> 1
|
|
// have 1 bit in bottom of dist, need nb more.
|
|
extra := (dist & 1) << (nb & regSizeMaskUint32)
|
|
for fnb < nb {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
extra |= fb & bitMask32[nb]
|
|
fb >>= nb & regSizeMaskUint32
|
|
fnb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
// slower: dist = bitMask32[nb+1] + 2 + extra
|
|
default:
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist too big:", dist, maxNumDist)
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
// No check on length; encoding can be prescient.
|
|
if dist > uint32(dict.histSize()) {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist > dict.histSize():", dist, dict.histSize())
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
f.copyLen, f.copyDist = length, int(dist)
|
|
goto copyHistory
|
|
}
|
|
|
|
copyHistory:
|
|
// Perform a backwards copy according to RFC section 3.2.3.
|
|
{
|
|
cnt := dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanBufioReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
// Not reached
|
|
}
|
|
|
|
// Decode a single Huffman block from f.
|
|
// hl and hd are the Huffman states for the lit/length values
|
|
// and the distance values, respectively. If hd == nil, using the
|
|
// fixed distance encoding associated with fixed Huffman blocks.
|
|
func (f *decompressor) huffmanStringsReader() {
|
|
const (
|
|
stateInit = iota // Zero value must be stateInit
|
|
stateDict
|
|
)
|
|
fr := f.r.(*strings.Reader)
|
|
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
fnb, fb, dict := f.nb, f.b, &f.dict
|
|
|
|
switch f.stepState {
|
|
case stateInit:
|
|
goto readLiteral
|
|
case stateDict:
|
|
goto copyHistory
|
|
}
|
|
|
|
readLiteral:
|
|
// Read literal and/or (length, distance) according to RFC section 3.2.3.
|
|
{
|
|
var v int
|
|
{
|
|
// Inlined v, err := f.huffSym(f.hl)
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hl.maxRead)
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hl.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var length int
|
|
switch {
|
|
case v < 256:
|
|
dict.writeByte(byte(v))
|
|
if dict.availWrite() == 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanStringsReader
|
|
f.stepState = stateInit
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.b, f.nb = fb, fnb
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
case v < maxNumLit:
|
|
val := decCodeToLen[(v - 257)]
|
|
length = int(val.length) + 3
|
|
n := uint(val.extra)
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
length += int(fb & bitMask32[n])
|
|
fb >>= n & regSizeMaskUint32
|
|
fnb -= n
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for fnb < 5 {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(fb & 0x1F << 3)))
|
|
fb >>= 5
|
|
fnb -= 5
|
|
} else {
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hd.maxRead)
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hd.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hd.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hd.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
dist = uint32(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case dist < 4:
|
|
dist++
|
|
case dist < maxNumDist:
|
|
nb := uint(dist-2) >> 1
|
|
// have 1 bit in bottom of dist, need nb more.
|
|
extra := (dist & 1) << (nb & regSizeMaskUint32)
|
|
for fnb < nb {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
extra |= fb & bitMask32[nb]
|
|
fb >>= nb & regSizeMaskUint32
|
|
fnb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
// slower: dist = bitMask32[nb+1] + 2 + extra
|
|
default:
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist too big:", dist, maxNumDist)
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
// No check on length; encoding can be prescient.
|
|
if dist > uint32(dict.histSize()) {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist > dict.histSize():", dist, dict.histSize())
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
f.copyLen, f.copyDist = length, int(dist)
|
|
goto copyHistory
|
|
}
|
|
|
|
copyHistory:
|
|
// Perform a backwards copy according to RFC section 3.2.3.
|
|
{
|
|
cnt := dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanStringsReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
// Not reached
|
|
}
|
|
|
|
// Decode a single Huffman block from f.
|
|
// hl and hd are the Huffman states for the lit/length values
|
|
// and the distance values, respectively. If hd == nil, using the
|
|
// fixed distance encoding associated with fixed Huffman blocks.
|
|
func (f *decompressor) huffmanGenericReader() {
|
|
const (
|
|
stateInit = iota // Zero value must be stateInit
|
|
stateDict
|
|
)
|
|
fr := f.r.(Reader)
|
|
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
fnb, fb, dict := f.nb, f.b, &f.dict
|
|
|
|
switch f.stepState {
|
|
case stateInit:
|
|
goto readLiteral
|
|
case stateDict:
|
|
goto copyHistory
|
|
}
|
|
|
|
readLiteral:
|
|
// Read literal and/or (length, distance) according to RFC section 3.2.3.
|
|
{
|
|
var v int
|
|
{
|
|
// Inlined v, err := f.huffSym(f.hl)
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hl.maxRead)
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hl.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var length int
|
|
switch {
|
|
case v < 256:
|
|
dict.writeByte(byte(v))
|
|
if dict.availWrite() == 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanGenericReader
|
|
f.stepState = stateInit
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.b, f.nb = fb, fnb
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
case v < maxNumLit:
|
|
val := decCodeToLen[(v - 257)]
|
|
length = int(val.length) + 3
|
|
n := uint(val.extra)
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
length += int(fb & bitMask32[n])
|
|
fb >>= n & regSizeMaskUint32
|
|
fnb -= n
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for fnb < 5 {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(fb & 0x1F << 3)))
|
|
fb >>= 5
|
|
fnb -= 5
|
|
} else {
|
|
// Since a huffmanDecoder can be empty or be composed of a degenerate tree
|
|
// with single element, huffSym must error on these two edge cases. In both
|
|
// cases, the chunks slice will be 0 for the invalid sequence, leading it
|
|
// satisfy the n == 0 check below.
|
|
n := uint(f.hd.maxRead)
|
|
// Optimization. Compiler isn't smart enough to keep f.b,f.nb in registers,
|
|
// but is smart enough to keep local variables in registers, so use nb and b,
|
|
// inline call to moreBits and reassign b,nb back to f on return.
|
|
for {
|
|
for fnb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
chunk := f.hd.chunks[fb&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hd.links[chunk>>huffmanValueShift][(fb>>huffmanChunkBits)&f.hd.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= fnb {
|
|
if n == 0 {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
fb = fb >> (n & regSizeMaskUint32)
|
|
fnb = fnb - n
|
|
dist = uint32(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case dist < 4:
|
|
dist++
|
|
case dist < maxNumDist:
|
|
nb := uint(dist-2) >> 1
|
|
// have 1 bit in bottom of dist, need nb more.
|
|
extra := (dist & 1) << (nb & regSizeMaskUint32)
|
|
for fnb < nb {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
f.roffset++
|
|
fb |= uint32(c) << (fnb & regSizeMaskUint32)
|
|
fnb += 8
|
|
}
|
|
extra |= fb & bitMask32[nb]
|
|
fb >>= nb & regSizeMaskUint32
|
|
fnb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
// slower: dist = bitMask32[nb+1] + 2 + extra
|
|
default:
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist too big:", dist, maxNumDist)
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
// No check on length; encoding can be prescient.
|
|
if dist > uint32(dict.histSize()) {
|
|
f.b, f.nb = fb, fnb
|
|
if debugDecode {
|
|
fmt.Println("dist > dict.histSize():", dist, dict.histSize())
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
|
|
f.copyLen, f.copyDist = length, int(dist)
|
|
goto copyHistory
|
|
}
|
|
|
|
copyHistory:
|
|
// Perform a backwards copy according to RFC section 3.2.3.
|
|
{
|
|
cnt := dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = dict.readFlush()
|
|
f.step = (*decompressor).huffmanGenericReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
f.b, f.nb = fb, fnb
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
// Not reached
|
|
}
|
|
|
|
func (f *decompressor) huffmanBlockDecoder() func() {
|
|
switch f.r.(type) {
|
|
case *bytes.Buffer:
|
|
return f.huffmanBytesBuffer
|
|
case *bytes.Reader:
|
|
return f.huffmanBytesReader
|
|
case *bufio.Reader:
|
|
return f.huffmanBufioReader
|
|
case *strings.Reader:
|
|
return f.huffmanStringsReader
|
|
case Reader:
|
|
return f.huffmanGenericReader
|
|
default:
|
|
return f.huffmanGenericReader
|
|
}
|
|
}
|