zoekt-indexserver: Prevent invalid config from causing an NPE (#612)

philwo · web-flow · commit 9abbb8b0d347 · 2023-07-12T09:18:57.000+02:00
When the user specifies an invalid mirror config that contains an entry
without any of the GithubUser / GithubOrg / ... repository definitions,
zoekt-indexserver would crash, because `cmd` stays `nil` and causes a
SIGSEGV when it is later accessed in `main.executeMirror`.
diff --git a/cmd/zoekt-indexserver/config.go b/cmd/zoekt-indexserver/config.go
@@ -260,6 +260,9 @@ func executeMirror(cfg []ConfigEntry, repoDir string, pendingRepos chan<- string
 				cmd.Args = append(cmd.Args, "-active")
 			}
 			cmd.Args = append(cmd.Args, c.GerritApiURL)
+		} else {
+			log.Printf("executeMirror: ignoring config, because it does not contain any valid repository definition: %q", c)
+			continue
 		}
 
 		stdout, _ := loggedRun(cmd)

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,9 @@ func executeMirror(cfg []ConfigEntry, repoDir string, pendingRepos chan<- string`
`260`	`260`	`cmd.Args = append(cmd.Args, "-active")`
`261`	`261`	`}`
`262`	`262`	`cmd.Args = append(cmd.Args, c.GerritApiURL)`
	`263`	`+ } else {`
	`264`	`+ log.Printf("executeMirror: ignoring config, because it does not contain any valid repository definition: %q", c)`
	`265`	`+ continue`
`263`	`266`	`}`
`264`	`267`
`265`	`268`	`stdout, _ := loggedRun(cmd)`