wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-27 06:04:47 +03:00
Code Issues Projects Releases Wiki Activity

gzip: fuzz: Don't uncompress on unknown compress method (nil create reader fn)

Browse Source
This commit is contained in:
Mattias Wadman 2021-12-06 15:41:39 +01:00
parent 91cc6d80f7
commit 3601fe3bcb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
format/gzip/gzip.go
View File

@ -106,16 +106,18 @@ func gzDecode(d *decode.D, in interface{}) interface{} {
rFn = func(r io.Reader) io.Reader { return flate.NewReader(r) }
}
readCompressedSize, uncompressedBB, dv, _, _ := d.TryFieldReaderRangeFormat("uncompressed", d.Pos(), d.BitsLeft(), rFn, probeFormat, nil)
if uncompressedBB != nil {
if dv == nil {
d.FieldRootBitBuf("uncompressed", uncompressedBB)
if rFn != nil {
readCompressedSize, uncompressedBB, dv, _, _ := d.TryFieldReaderRangeFormat("uncompressed", d.Pos(), d.BitsLeft(), rFn, probeFormat, nil)
if uncompressedBB != nil {
if dv == nil {
d.FieldRootBitBuf("uncompressed", uncompressedBB)
}
d.FieldRawLen("compressed", readCompressedSize)
crc32W := crc32.NewIEEE()
d.MustCopy(crc32W, uncompressedBB.Clone())
d.FieldU32("crc32", d.ValidateUBytes(crc32W.Sum(nil)), scalar.Hex)
d.FieldU32("isize")
}
d.FieldRawLen("compressed", readCompressedSize)
crc32W := crc32.NewIEEE()
d.MustCopy(crc32W, uncompressedBB.Clone())
d.FieldU32("crc32", d.ValidateUBytes(crc32W.Sum(nil)), scalar.Hex)
d.FieldU32("isize")
}
return nil