Merge pull request #67 from vbatts/troubleshoot_65

vbatts · web-flow · commit 9982e470fa34 · 2023-07-21T09:10:47.000-04:00
don't add a padding entry if it has no bytes
diff --git a/tar/asm/assemble_test.go b/tar/asm/assemble_test.go
@@ -140,6 +140,7 @@ var testCases = []struct {
 	{"./testdata/iso-8859.tar.gz", "ddafa51cb03c74ec117ab366ee2240d13bba1ec3", 10240},
 	{"./testdata/extranils.tar.gz", "e187b4b3e739deaccc257342f4940f34403dc588", 10648},
 	{"./testdata/notenoughnils.tar.gz", "72f93f41efd95290baa5c174c234f5d4c22ce601", 512},
+	{"./testdata/1c51fc286aa95d9413226599576bafa38490b1e292375c90de095855b64caea6", "946caa03167a8cc707db6ff9785608b652e631dc", 1024},
 }
 
 func TestTarStream(t *testing.T) {
diff --git a/tar/asm/disassemble.go b/tar/asm/disassemble.go
@@ -135,6 +135,9 @@ func NewInputTarStream(r io.Reader, p storage.Packer, fp storage.FilePutter) (io
 				}
 				isEOF = true
 			}
+			if n == 0 {
+				break
+			}
 			_, err = p.AddEntry(storage.Entry{
 				Type:    storage.SegmentType,
 				Payload: paddingChunk[:n],
diff --git a/tar/asm/testdata/1c51fc286aa95d9413226599576bafa38490b1e292375c90de095855b64caea6 b/tar/asm/testdata/1c51fc286aa95d9413226599576bafa38490b1e292375c90de095855b64caea6

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ var testCases = []struct {`
`140`	`140`	`{"./testdata/iso-8859.tar.gz", "ddafa51cb03c74ec117ab366ee2240d13bba1ec3", 10240},`
`141`	`141`	`{"./testdata/extranils.tar.gz", "e187b4b3e739deaccc257342f4940f34403dc588", 10648},`
`142`	`142`	`{"./testdata/notenoughnils.tar.gz", "72f93f41efd95290baa5c174c234f5d4c22ce601", 512},`
	`143`	`+ {"./testdata/1c51fc286aa95d9413226599576bafa38490b1e292375c90de095855b64caea6", "946caa03167a8cc707db6ff9785608b652e631dc", 1024},`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`func TestTarStream(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,9 @@ func NewInputTarStream(r io.Reader, p storage.Packer, fp storage.FilePutter) (io`
`135`	`135`	`}`
`136`	`136`	`isEOF = true`
`137`	`137`	`}`
	`138`	`+ if n == 0 {`
	`139`	`+ break`
	`140`	`+ }`
`138`	`141`	`_, err = p.AddEntry(storage.Entry{`
`139`	`142`	`Type: storage.SegmentType,`
`140`	`143`	`Payload: paddingChunk[:n],`