12a1f914f4
* update github.com/alecthomas/chroma v0.8.0 -> v0.8.1 * github.com/blevesearch/bleve v1.0.10 -> v1.0.12 * editorconfig-core-go v2.1.1 -> v2.3.7 * github.com/gliderlabs/ssh v0.2.2 -> v0.3.1 * migrate editorconfig.ParseBytes to Parse * github.com/shurcooL/vfsgen to 0d455de96546 * github.com/go-git/go-git/v5 v5.1.0 -> v5.2.0 * github.com/google/uuid v1.1.1 -> v1.1.2 * github.com/huandu/xstrings v1.3.0 -> v1.3.2 * github.com/klauspost/compress v1.10.11 -> v1.11.1 * github.com/markbates/goth v1.61.2 -> v1.65.0 * github.com/mattn/go-sqlite3 v1.14.0 -> v1.14.4 * github.com/mholt/archiver v3.3.0 -> v3.3.2 * github.com/microcosm-cc/bluemonday 4f7140c49acb -> v1.0.4 * github.com/minio/minio-go v7.0.4 -> v7.0.5 * github.com/olivere/elastic v7.0.9 -> v7.0.20 * github.com/urfave/cli v1.20.0 -> v1.22.4 * github.com/prometheus/client_golang v1.1.0 -> v1.8.0 * github.com/xanzy/go-gitlab v0.37.0 -> v0.38.1 * mvdan.cc/xurls v2.1.0 -> v2.2.0 Co-authored-by: Lauris BH <lauris@nix.lv>
930 lines
21 KiB
Go
Vendored
930 lines
21 KiB
Go
Vendored
// 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)
|
|
moreBits := func() error {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
return noEOF(err)
|
|
}
|
|
f.roffset++
|
|
f.b |= uint32(c) << f.nb
|
|
f.nb += 8
|
|
return nil
|
|
}
|
|
|
|
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)
|
|
// 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.
|
|
nb, b := f.nb, f.b
|
|
for {
|
|
for nb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b = b
|
|
f.nb = nb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
b |= uint32(c) << (nb & regSizeMaskUint32)
|
|
nb += 8
|
|
}
|
|
chunk := f.hl.chunks[b&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(b>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= nb {
|
|
if n == 0 {
|
|
f.b = b
|
|
f.nb = nb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
f.b = b >> (n & regSizeMaskUint32)
|
|
f.nb = nb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var n uint // number of bits extra
|
|
var length int
|
|
var err error
|
|
switch {
|
|
case v < 256:
|
|
f.dict.writeByte(byte(v))
|
|
if f.dict.availWrite() == 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesBuffer
|
|
f.stepState = stateInit
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
n = 0
|
|
case v < 269:
|
|
length = v*2 - (265*2 - 11)
|
|
n = 1
|
|
case v < 273:
|
|
length = v*4 - (269*4 - 19)
|
|
n = 2
|
|
case v < 277:
|
|
length = v*8 - (273*8 - 35)
|
|
n = 3
|
|
case v < 281:
|
|
length = v*16 - (277*16 - 67)
|
|
n = 4
|
|
case v < 285:
|
|
length = v*32 - (281*32 - 131)
|
|
n = 5
|
|
case v < maxNumLit:
|
|
length = 258
|
|
n = 0
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
if n > 0 {
|
|
for f.nb < n {
|
|
if err = moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
length += int(f.b & uint32(1<<(n®SizeMaskUint32)-1))
|
|
f.b >>= n & regSizeMaskUint32
|
|
f.nb -= n
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for f.nb < 5 {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(f.b & 0x1F << 3)))
|
|
f.b >>= 5
|
|
f.nb -= 5
|
|
} else {
|
|
sym, err := f.huffSym(f.hd)
|
|
if err != nil {
|
|
if debugDecode {
|
|
fmt.Println("huffsym:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
dist = uint32(sym)
|
|
}
|
|
|
|
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 f.nb < nb {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
extra |= f.b & uint32(1<<(nb®SizeMaskUint32)-1)
|
|
f.b >>= nb & regSizeMaskUint32
|
|
f.nb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
default:
|
|
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(f.dict.histSize()) {
|
|
if debugDecode {
|
|
fmt.Println("dist > f.dict.histSize():", dist, f.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 := f.dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = f.dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if f.dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesBuffer // We need to continue this work
|
|
f.stepState = stateDict
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
}
|
|
|
|
// 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)
|
|
moreBits := func() error {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
return noEOF(err)
|
|
}
|
|
f.roffset++
|
|
f.b |= uint32(c) << f.nb
|
|
f.nb += 8
|
|
return nil
|
|
}
|
|
|
|
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)
|
|
// 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.
|
|
nb, b := f.nb, f.b
|
|
for {
|
|
for nb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b = b
|
|
f.nb = nb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
b |= uint32(c) << (nb & regSizeMaskUint32)
|
|
nb += 8
|
|
}
|
|
chunk := f.hl.chunks[b&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(b>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= nb {
|
|
if n == 0 {
|
|
f.b = b
|
|
f.nb = nb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
f.b = b >> (n & regSizeMaskUint32)
|
|
f.nb = nb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var n uint // number of bits extra
|
|
var length int
|
|
var err error
|
|
switch {
|
|
case v < 256:
|
|
f.dict.writeByte(byte(v))
|
|
if f.dict.availWrite() == 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesReader
|
|
f.stepState = stateInit
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
n = 0
|
|
case v < 269:
|
|
length = v*2 - (265*2 - 11)
|
|
n = 1
|
|
case v < 273:
|
|
length = v*4 - (269*4 - 19)
|
|
n = 2
|
|
case v < 277:
|
|
length = v*8 - (273*8 - 35)
|
|
n = 3
|
|
case v < 281:
|
|
length = v*16 - (277*16 - 67)
|
|
n = 4
|
|
case v < 285:
|
|
length = v*32 - (281*32 - 131)
|
|
n = 5
|
|
case v < maxNumLit:
|
|
length = 258
|
|
n = 0
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
if n > 0 {
|
|
for f.nb < n {
|
|
if err = moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
length += int(f.b & uint32(1<<(n®SizeMaskUint32)-1))
|
|
f.b >>= n & regSizeMaskUint32
|
|
f.nb -= n
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for f.nb < 5 {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(f.b & 0x1F << 3)))
|
|
f.b >>= 5
|
|
f.nb -= 5
|
|
} else {
|
|
sym, err := f.huffSym(f.hd)
|
|
if err != nil {
|
|
if debugDecode {
|
|
fmt.Println("huffsym:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
dist = uint32(sym)
|
|
}
|
|
|
|
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 f.nb < nb {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
extra |= f.b & uint32(1<<(nb®SizeMaskUint32)-1)
|
|
f.b >>= nb & regSizeMaskUint32
|
|
f.nb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
default:
|
|
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(f.dict.histSize()) {
|
|
if debugDecode {
|
|
fmt.Println("dist > f.dict.histSize():", dist, f.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 := f.dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = f.dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if f.dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBytesReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
}
|
|
|
|
// 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)
|
|
moreBits := func() error {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
return noEOF(err)
|
|
}
|
|
f.roffset++
|
|
f.b |= uint32(c) << f.nb
|
|
f.nb += 8
|
|
return nil
|
|
}
|
|
|
|
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)
|
|
// 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.
|
|
nb, b := f.nb, f.b
|
|
for {
|
|
for nb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b = b
|
|
f.nb = nb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
b |= uint32(c) << (nb & regSizeMaskUint32)
|
|
nb += 8
|
|
}
|
|
chunk := f.hl.chunks[b&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(b>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= nb {
|
|
if n == 0 {
|
|
f.b = b
|
|
f.nb = nb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
f.b = b >> (n & regSizeMaskUint32)
|
|
f.nb = nb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var n uint // number of bits extra
|
|
var length int
|
|
var err error
|
|
switch {
|
|
case v < 256:
|
|
f.dict.writeByte(byte(v))
|
|
if f.dict.availWrite() == 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBufioReader
|
|
f.stepState = stateInit
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
n = 0
|
|
case v < 269:
|
|
length = v*2 - (265*2 - 11)
|
|
n = 1
|
|
case v < 273:
|
|
length = v*4 - (269*4 - 19)
|
|
n = 2
|
|
case v < 277:
|
|
length = v*8 - (273*8 - 35)
|
|
n = 3
|
|
case v < 281:
|
|
length = v*16 - (277*16 - 67)
|
|
n = 4
|
|
case v < 285:
|
|
length = v*32 - (281*32 - 131)
|
|
n = 5
|
|
case v < maxNumLit:
|
|
length = 258
|
|
n = 0
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
if n > 0 {
|
|
for f.nb < n {
|
|
if err = moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
length += int(f.b & uint32(1<<(n®SizeMaskUint32)-1))
|
|
f.b >>= n & regSizeMaskUint32
|
|
f.nb -= n
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for f.nb < 5 {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(f.b & 0x1F << 3)))
|
|
f.b >>= 5
|
|
f.nb -= 5
|
|
} else {
|
|
sym, err := f.huffSym(f.hd)
|
|
if err != nil {
|
|
if debugDecode {
|
|
fmt.Println("huffsym:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
dist = uint32(sym)
|
|
}
|
|
|
|
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 f.nb < nb {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
extra |= f.b & uint32(1<<(nb®SizeMaskUint32)-1)
|
|
f.b >>= nb & regSizeMaskUint32
|
|
f.nb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
default:
|
|
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(f.dict.histSize()) {
|
|
if debugDecode {
|
|
fmt.Println("dist > f.dict.histSize():", dist, f.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 := f.dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = f.dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if f.dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanBufioReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
}
|
|
|
|
// 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)
|
|
moreBits := func() error {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
return noEOF(err)
|
|
}
|
|
f.roffset++
|
|
f.b |= uint32(c) << f.nb
|
|
f.nb += 8
|
|
return nil
|
|
}
|
|
|
|
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)
|
|
// 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.
|
|
nb, b := f.nb, f.b
|
|
for {
|
|
for nb < n {
|
|
c, err := fr.ReadByte()
|
|
if err != nil {
|
|
f.b = b
|
|
f.nb = nb
|
|
f.err = noEOF(err)
|
|
return
|
|
}
|
|
f.roffset++
|
|
b |= uint32(c) << (nb & regSizeMaskUint32)
|
|
nb += 8
|
|
}
|
|
chunk := f.hl.chunks[b&(huffmanNumChunks-1)]
|
|
n = uint(chunk & huffmanCountMask)
|
|
if n > huffmanChunkBits {
|
|
chunk = f.hl.links[chunk>>huffmanValueShift][(b>>huffmanChunkBits)&f.hl.linkMask]
|
|
n = uint(chunk & huffmanCountMask)
|
|
}
|
|
if n <= nb {
|
|
if n == 0 {
|
|
f.b = b
|
|
f.nb = nb
|
|
if debugDecode {
|
|
fmt.Println("huffsym: n==0")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
f.b = b >> (n & regSizeMaskUint32)
|
|
f.nb = nb - n
|
|
v = int(chunk >> huffmanValueShift)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
var n uint // number of bits extra
|
|
var length int
|
|
var err error
|
|
switch {
|
|
case v < 256:
|
|
f.dict.writeByte(byte(v))
|
|
if f.dict.availWrite() == 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanStringsReader
|
|
f.stepState = stateInit
|
|
return
|
|
}
|
|
goto readLiteral
|
|
case v == 256:
|
|
f.finishBlock()
|
|
return
|
|
// otherwise, reference to older data
|
|
case v < 265:
|
|
length = v - (257 - 3)
|
|
n = 0
|
|
case v < 269:
|
|
length = v*2 - (265*2 - 11)
|
|
n = 1
|
|
case v < 273:
|
|
length = v*4 - (269*4 - 19)
|
|
n = 2
|
|
case v < 277:
|
|
length = v*8 - (273*8 - 35)
|
|
n = 3
|
|
case v < 281:
|
|
length = v*16 - (277*16 - 67)
|
|
n = 4
|
|
case v < 285:
|
|
length = v*32 - (281*32 - 131)
|
|
n = 5
|
|
case v < maxNumLit:
|
|
length = 258
|
|
n = 0
|
|
default:
|
|
if debugDecode {
|
|
fmt.Println(v, ">= maxNumLit")
|
|
}
|
|
f.err = CorruptInputError(f.roffset)
|
|
return
|
|
}
|
|
if n > 0 {
|
|
for f.nb < n {
|
|
if err = moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits n>0:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
length += int(f.b & uint32(1<<(n®SizeMaskUint32)-1))
|
|
f.b >>= n & regSizeMaskUint32
|
|
f.nb -= n
|
|
}
|
|
|
|
var dist uint32
|
|
if f.hd == nil {
|
|
for f.nb < 5 {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<5:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
dist = uint32(bits.Reverse8(uint8(f.b & 0x1F << 3)))
|
|
f.b >>= 5
|
|
f.nb -= 5
|
|
} else {
|
|
sym, err := f.huffSym(f.hd)
|
|
if err != nil {
|
|
if debugDecode {
|
|
fmt.Println("huffsym:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
dist = uint32(sym)
|
|
}
|
|
|
|
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 f.nb < nb {
|
|
if err = f.moreBits(); err != nil {
|
|
if debugDecode {
|
|
fmt.Println("morebits f.nb<nb:", err)
|
|
}
|
|
f.err = err
|
|
return
|
|
}
|
|
}
|
|
extra |= f.b & uint32(1<<(nb®SizeMaskUint32)-1)
|
|
f.b >>= nb & regSizeMaskUint32
|
|
f.nb -= nb
|
|
dist = 1<<((nb+1)®SizeMaskUint32) + 1 + extra
|
|
default:
|
|
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(f.dict.histSize()) {
|
|
if debugDecode {
|
|
fmt.Println("dist > f.dict.histSize():", dist, f.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 := f.dict.tryWriteCopy(f.copyDist, f.copyLen)
|
|
if cnt == 0 {
|
|
cnt = f.dict.writeCopy(f.copyDist, f.copyLen)
|
|
}
|
|
f.copyLen -= cnt
|
|
|
|
if f.dict.availWrite() == 0 || f.copyLen > 0 {
|
|
f.toRead = f.dict.readFlush()
|
|
f.step = (*decompressor).huffmanStringsReader // We need to continue this work
|
|
f.stepState = stateDict
|
|
return
|
|
}
|
|
goto readLiteral
|
|
}
|
|
}
|
|
|
|
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
|
|
default:
|
|
return f.huffmanBlockGeneric
|
|
}
|
|
}
|