Correctly handle Read returning (0, nil)

It's not an EOF indication. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
vbatts · Jul 22, 2023 · cd197d3 · cd197d3
1 parent 9982e47
commit cd197d3
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/tar/asm/disassemble.go b/tar/asm/disassemble.go
@@ -135,16 +135,15 @@ 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],
-			})
-			if err != nil {
-				pW.CloseWithError(err)
-				return
+			if n != 0 {
+				_, err = p.AddEntry(storage.Entry{
+					Type:    storage.SegmentType,
+					Payload: paddingChunk[:n],
+				})
+				if err != nil {
+					pW.CloseWithError(err)
+					return
+				}
 			}
 			if isEOF {
 				break