zstd: Fix fallback on incompressible block (#798)

Regresssion from #792 (unreleased)
klauspost · Mar 28, 2023 · 47eb6d4 · 47eb6d4
1 parent 5753c12
commit 47eb6d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/zstd/blockenc.go b/zstd/blockenc.go
@@ -782,7 +782,8 @@ func (b *blockEnc) encode(org []byte, raw, rawAllLits bool) error {
 	// Maybe even add a bigger margin.
 	if len(b.output)-3-bhOffset >= b.size {
 		// Discard and encode as raw block.
-		b.encodeRaw(org)
+		b.output = b.encodeRawTo(b.output[:bhOffset], org)
+		b.popOffsets()
 		b.litEnc.Reuse = huff0.ReusePolicyNone
 		return nil
 	}

diff --git a/zstd/testdata/fuzz/encode-corpus-encoded.zip b/zstd/testdata/fuzz/encode-corpus-encoded.zip