git-am: handle missing "author" when parsing commit

We try to parse the "author" line out of a commit buffer. We handle the case that split_ident_line() doesn't work, but we don't do any error checking that we found an "author" line in the first place! This would cause us to segfault on such a corrupt object. Let's put in an explicit NULL check (we can just die(), which is what a bogus split would do, too). As a bonus, this silences a warning when compiling with gcc 9.2.1 using "-flto -O3", which claims that ident_len may be uninitialized (it would only be if we had a NULL here). Reported-by: Stephan Beyer <s-beyer@gmx.net> Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 5, 2019 at 18:50 UTC 0dfed92dfdb95c2f12df7299bb1e606d79185626
1 file changed +3 -1
builtin/am.c
+3 -1
@@ -1272,7 +1272,9 @@ static void get_commit_info(struct am_state *state, struct commit *commit)
1272 buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding());
1273
1274 ident_line = find_commit_header(buffer, "author", &ident_len);
1275 -
1275 + if (!ident_line)
1276 + die(_("missing author line in commit %s"),
1277 + oid_to_hex(&commit->object.oid));
1278 if (split_ident_line(&id, ident_line, ident_len) < 0)
1279 die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);
1280