grep: handle corrupt index files early

stefanbeller · gitster · commit b2aa84c789a0 · 2018-05-16T09:48:32.000+09:00
Any other caller of 'repo_read_index' dies upon a negative return of
it, so grep should, too.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -480,7 +480,8 @@ static int grep_cache(struct grep_opt *opt, struct repository *repo,
 		strbuf_addstr(&name, repo->submodule_prefix);
 	}
 
-	repo_read_index(repo);
+	if (repo_read_index(repo) < 0)
+		die("index file corrupt");
 
 	for (nr = 0; nr < repo->index->cache_nr; nr++) {
 		const struct cache_entry *ce = repo->index->cache[nr];

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,8 @@ static int grep_cache(struct grep_opt opt, struct repository repo,`
`480`	`480`	`strbuf_addstr(&name, repo->submodule_prefix);`
`481`	`481`	`}`
`482`	`482`
`483`		`- repo_read_index(repo);`
	`483`	`+ if (repo_read_index(repo) < 0)`
	`484`	`+ die("index file corrupt");`
`484`	`485`
`485`	`486`	`for (nr = 0; nr < repo->index->cache_nr; nr++) {`
`486`	`487`	`const struct cache_entry *ce = repo->index->cache[nr];`