Merge pull request #684 from srl-labs/filecopy-fix

fixed nil deref in `CopyFile`
srl-labs · Nov 18, 2021 · 3d7c6bc · 3d7c6bc
2 parents c5b890d + 5486915
commit 3d7c6bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/docs/rn/0.20.md b/docs/rn/0.20.md
@@ -24,6 +24,10 @@ For example, here is our [NANOG83 talk](../community.md):
 * Containerlab' config engine will not error on the nodes for which credentials were not found ([#675](https://github.com/srl-labs/containerlab/pull/675))
 * SONiC boot will not block in case of failures ([#678](https://github.com/srl-labs/containerlab/pull/678))
 
+## Patches
+
+### 0.20.1
+* Fix panic when copy files ([#684](https://github.com/srl-labs/containerlab/pull/684))
 
 ## New contributors
-Welcome [@LimeHat](https://github.com/LimeHat) and thank you for your contributions to containerlab!
+Welcome [@LimeHat](https://github.com/LimeHat), and thank you for your contributions to containerlab!
diff --git a/utils/file.go b/utils/file.go
@@ -43,14 +43,14 @@ func CopyFile(src, dst string, mode os.FileMode) (err error) {
 		if !os.IsNotExist(err) {
 			return err
 		}
-	}
-
-	if !(dfi.Mode().IsRegular()) {
-		return fmt.Errorf("CopyFile: non-regular destination file %s (%q)", dfi.Name(), dfi.Mode().String())
-	}
+	} else {
+		if !(dfi.Mode().IsRegular()) {
+			return fmt.Errorf("CopyFile: non-regular destination file %s (%q)", dfi.Name(), dfi.Mode().String())
+		}
 
-	if sfi != nil && os.SameFile(sfi, dfi) {
-		return
+		if sfi != nil && os.SameFile(sfi, dfi) {
+			return
+		}
 	}
 
 	return CopyFileContents(src, dst, mode)