trivy: improve filepath.Rel call when root is / in walker (#34604)

DataDog · Mar 3, 2025 · a0caaff · a0caaff
1 parent 96cdcd7
commit a0caaff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/util/trivy/walker.go b/pkg/util/trivy/walker.go
@@ -78,7 +78,11 @@ func (w *FSWalker) WalkDirFunc(root string, fn walker.WalkFunc, opt walker.Optio
 		}
 
 		if !strings.HasPrefix(filePath, "/") {
-			filePath = root + "/" + filePath
+			if strings.HasSuffix(root, "/") {
+				filePath = root + filePath
+			} else {
+				filePath = root + "/" + filePath
+			}
 		}
 
 		relPath, err := filepath.Rel(root, filePath)