From: René Scharfe <l.s.r@web.de>
Date: Sat, 6 May 2017 17:13:56 +0000 (+0200)
Subject: am: check return value of resolve_refdup before using hash
X-Git-Tag: v2.13.1~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57e0ef0e0e90c4cb72c35db874fc3d035b88ce4d;p=thirdparty%2Fgit.git

am: check return value of resolve_refdup before using hash

If resolve_refdup() fails it returns NULL and possibly leaves its hash
output parameter untouched.  Make sure to use it only if the function
succeeded, in order to avoid accessing uninitialized memory.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/am.c b/builtin/am.c
index 31fb60578f..695968622a 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2157,7 +2157,7 @@ static void am_abort(struct am_state *state)
 	am_rerere_clear();
 
 	curr_branch = resolve_refdup("HEAD", 0, curr_head.hash, NULL);
-	has_curr_head = !is_null_oid(&curr_head);
+	has_curr_head = curr_branch && !is_null_oid(&curr_head);
 	if (!has_curr_head)
 		hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);