From: Tzvetan Mikov Date: Fri, 31 Oct 2014 19:43:56 GMT Subject: [PATCH] line-log: fix crash when --first-parent is used Message-ID: <1414784636-43155-1-git-send-email-tmikov@gmail.com> line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele Signed-off-by: Tzvetan Mikov --- line-log.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/line-log.c b/line-log.c index 1008e72..86e7274 100644 --- a/line-log.c +++ b/line-log.c @@ -1141,6 +1141,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm int i; int nparents = commit_list_count(commit->parents); + if (nparents > 1 && rev->first_parent_only) + nparents = 1; + diffqueues = xmalloc(nparents * sizeof(*diffqueues)); cand = xmalloc(nparents * sizeof(*cand)); parents = xmalloc(nparents * sizeof(*parents)); -- 1.9.1