Merge pull request containers#2703 from nalind/copier-create-error

copier.copierHandlerPut: don't check length when there are errors
rhatdan · Oct 20, 2020 · 9229549 · 9229549
2 parents a970ffb + b7c1c3d
commit 9229549
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/copier/copier.go b/copier/copier.go
@@ -1393,7 +1393,9 @@ func copierHandlerPut(bulkReader io.Reader, req request, idMappings *idtools.IDM
 			case tar.TypeReg, tar.TypeRegA:
 				var written int64
 				written, err = createFile(path, tr)
-				if written != hdr.Size {
+				// only check the length if there wasn't an error, which we'll
+				// check along with errors for other types of entries
+				if err == nil && written != hdr.Size {
 					return errors.Errorf("copier: put: error creating %q: incorrect length (%d != %d)", path, written, hdr.Size)
 				}
 			case tar.TypeLink: