fix(windows): crash on out of bounds for root path cleanup

Signed-off-by: manifestori <ori@manifestcyber.com>
spdx · May 20, 2024 · 0e46c1c · 0e46c1c
1 parent aa7bfad
commit 0e46c1c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/builder/build_package.go b/builder/build_package.go
@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strings"
 
 	"github.com/spdx/tools-golang/spdx"
 	"github.com/spdx/tools-golang/spdx/v2/common"
@@ -42,7 +43,11 @@ func BuildPackageSection(packageName string, dirRoot string, pathsIgnore []strin
 	for _, fp := range filepaths {
 		newFilePatch := ""
 		if osType == "windows" {
-			newFilePatch = filepath.FromSlash("." + fp[dirRootLen:])
+			if strings.HasPrefix(fp, dirRoot) {
+				newFilePatch = filepath.FromSlash("." + fp[dirRootLen:])
+			} else {
+				newFilePatch = filepath.FromSlash("." + fp)
+			}
 		} else {
 			newFilePatch = filepath.FromSlash("./" + fp)
 		}