Fix slice bounds out of range (#59)

jwplayer · Apr 27, 2020 · 8bd0095 · 8bd0095
1 parent 53730b7
commit 8bd0095
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/git.go b/git.go
@@ -60,12 +60,12 @@ func determineGitArgs(branch string, defaultBranch string) []string {
 }
 
 func index(slice []string, item string) int {
-    for i, _ := range slice {
-        if slice[i] == item {
-            return i
-        }
-    }
-    return -1
+	for i, _ := range slice {
+		if slice[i] == item {
+			return i
+		}
+	}
+	return -1
 }
 
 func getChangedFiles() []string {
@@ -74,8 +74,7 @@ func getChangedFiles() []string {
 	defaultBranch := getEnv(pluginPrefix+"DEFAULT_BRANCH", "master")
 
 	cmdArgs := determineGitArgs(branch, defaultBranch)
-	out := execCommand("git", cmdArgs)
-	changedFiles := strings.Split(strings.TrimSpace(out), "\n")
+	changedFiles := strings.Split(execCommand("git", cmdArgs), "\n")
 
 	if branch == defaultBranch {
 		firstMergeBreak := index(changedFiles, "")

diff --git a/project.go b/project.go
@@ -54,6 +54,9 @@ func (p *Project) checkAffected(changedFiles []string) bool {
 		normalizedPath := path.Clean(filePath)
 		projectDirs := strings.Split(normalizedPath, "/")
 		for _, changedFile := range changedFiles {
+			if changedFile == "" {
+				continue
+			}
 			changedDirs := strings.Split(changedFile, "/")
 			if reflect.DeepEqual(changedDirs[:len(projectDirs)], projectDirs) {
 				return true