diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-05-27 12:34:22 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-05-27 12:34:26 -0400 |
| commit | c9609d820b6fd4082eecf7904178c361a22de6e9 (patch) | |
| tree | f22728d168b0785b5ee0b80ec3d3f238aef41a31 /vendor/github.com/klauspost/compress/zstd/blockdec.go | |
| parent | cd1f99d063cf8bb4efdb22d2f56f1aef73ff4ba0 (diff) | |
| download | podman-c9609d820b6fd4082eecf7904178c361a22de6e9.tar.gz podman-c9609d820b6fd4082eecf7904178c361a22de6e9.tar.bz2 podman-c9609d820b6fd4082eecf7904178c361a22de6e9.zip | |
Vendor in containers/storage v1.32.1
Theoretically this should fix the aweful flake we have
been suffering with.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/klauspost/compress/zstd/blockdec.go')
| -rw-r--r-- | vendor/github.com/klauspost/compress/zstd/blockdec.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vendor/github.com/klauspost/compress/zstd/blockdec.go b/vendor/github.com/klauspost/compress/zstd/blockdec.go index b51d922bd..6cea054d2 100644 --- a/vendor/github.com/klauspost/compress/zstd/blockdec.go +++ b/vendor/github.com/klauspost/compress/zstd/blockdec.go @@ -123,12 +123,10 @@ func newBlockDec(lowMem bool) *blockDec { // Input must be a start of a block and will be at the end of the block when returned. func (b *blockDec) reset(br byteBuffer, windowSize uint64) error { b.WindowSize = windowSize - tmp := br.readSmall(3) - if tmp == nil { - if debug { - println("Reading block header:", io.ErrUnexpectedEOF) - } - return io.ErrUnexpectedEOF + tmp, err := br.readSmall(3) + if err != nil { + println("Reading block header:", err) + return err } bh := uint32(tmp[0]) | (uint32(tmp[1]) << 8) | (uint32(tmp[2]) << 16) b.Last = bh&1 != 0 @@ -179,7 +177,6 @@ func (b *blockDec) reset(br byteBuffer, windowSize uint64) error { if cap(b.dst) <= maxSize { b.dst = make([]byte, 0, maxSize+1) } - var err error b.data, err = br.readBig(cSize, b.dataStorage) if err != nil { if debug { |