zip: Fix nested decode for none compress

wader · Nov 21, 2021 · 9029143 · 9029143
1 parent 0480a2f
commit 9029143
Show file tree

Hide file tree

Showing 9 changed files with 1,854 additions and 1,220 deletions.
diff --git a/format/zip/testdata/.DS_Store b/format/zip/testdata/.DS_Store
diff --git a/format/zip/testdata/test-macos.fqtest b/format/zip/testdata/test-macos.fqtest
diff --git a/format/zip/testdata/test-macos.zip b/format/zip/testdata/test-macos.zip
diff --git a/format/zip/testdata/test/b.png b/format/zip/testdata/test/b.png
diff --git a/format/zip/testdata/test0.fqtest b/format/zip/testdata/test0.fqtest
diff --git a/format/zip/testdata/test0.zip b/format/zip/testdata/test0.zip
diff --git a/format/zip/testdata/test9.fqtest b/format/zip/testdata/test9.fqtest
diff --git a/format/zip/testdata/test9.zip b/format/zip/testdata/test9.zip
diff --git 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 {