zip: Fix nested decode for none compress

2024-11-23 18:56:52 +03:00 · 2021-11-21 12:01:09 +01:00 · 2021-11-21 12:01:09 +01:00 · 9029143acc
commit 9029143acc
parent 0480a2f722
9 changed files with 1854 additions and 1220 deletions
--- a/format/zip/testdata/.DS_Store
+++ b/format/zip/testdata/.DS_Store
--- a/format/zip/testdata/test-macos.fqtest
+++ b/format/zip/testdata/test-macos.fqtest
--- a/format/zip/testdata/test-macos.zip
+++ b/format/zip/testdata/test-macos.zip
--- a/format/zip/testdata/test/b.png
+++ b/format/zip/testdata/test/b.png
--- a/format/zip/testdata/test0.fqtest
+++ b/format/zip/testdata/test0.fqtest
--- a/format/zip/testdata/test0.zip
+++ b/format/zip/testdata/test0.zip
--- a/format/zip/testdata/test9.fqtest
+++ b/format/zip/testdata/test9.fqtest
--- a/format/zip/testdata/test9.zip
+++ b/format/zip/testdata/test9.zip
--- a/format/zip/zip.go
+++ b/format/zip/zip.go
@ -277,7 +277,9 @@ func zipDecode(d *decode.D, in interface{}) interface{} {
 				}

 				if compressionMethod == compressionMethodNone {
-					d.FieldRawLen("uncompressed", compressedSize)
+					if dv, _, _ := d.FieldTryFormatLen("uncompressed", compressedSize, probeFormat, nil); dv == nil {
+						d.FieldRawLen("uncompressed", compressedSize)
+					}
 				} else {
 					var rFn func(r io.Reader) io.Reader
 					switch compressionMethod {