Skip to content

Commit

Permalink
git cherry-pick: do not dereference a potential NULL pointer
Browse files Browse the repository at this point in the history
In the case the pointer could be NULL, the function that gave the caller
the NULL pointer would already have issued an error message, so simply
returning early with an error status without issuing a new message is
sufficient.  The same for parse_commit() that will show necessary error
message when the argument is not NULL, and will return error silently
when the argument is NULL.

Noticed-by: Michael Mueller
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Neil Horman authored and Junio C Hamano committed May 3, 2012
1 parent 90e1818 commit 4b58006
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,17 @@ static int is_index_unchanged(void)
return error(_("Could not resolve HEAD commit\n"));

head_commit = lookup_commit(head_sha1);
if (!head_commit || parse_commit(head_commit))
return error(_("could not parse commit %s\n"),
sha1_to_hex(head_commit->object.sha1));

/*
* If head_commit is NULL, check_commit, called from
* lookup_commit, would have indicated that head_commit is not
* a commit object already. parse_commit() will return failure
* without further complaints in such a case. Otherwise, if
* the commit is invalid, parse_commit() will complain. So
* there is nothing for us to say here. Just return failure.
*/
if (parse_commit(head_commit))
return -1;

if (!active_cache_tree)
active_cache_tree = cache_tree();
Expand Down

0 comments on commit 4b58006

Please sign in to comment.