diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:12 +0900 |
| commit | a207ad7081e42a64f826bd4d5193cecb67c84024 (patch) | |
| tree | a627c90f3a0f8d32d026a478cbee765648f6d5ae | |
| parent | c8c33216333c4b2ba86f51d9fa77f7c4daba8d30 (diff) | |
| parent | 57e0ef0e0e90c4cb72c35db874fc3d035b88ce4d (diff) | |
| download | git-a207ad7081e42a64f826bd4d5193cecb67c84024.tar.gz | |
Merge branch 'rs/checkout-am-fix-unborn' into maint
A few codepaths in "checkout" and "am" working on an unborn branch
tried to access an uninitialized piece of memory.
* rs/checkout-am-fix-unborn:
am: check return value of resolve_refdup before using hash
checkout: check return value of resolve_refdup before using hash
| -rw-r--r-- | builtin/am.c | 2 | ||||
| -rw-r--r-- | builtin/checkout.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index 4b89289d1e..e39142e4d2 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2148,7 +2148,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); diff --git a/builtin/checkout.c b/builtin/checkout.c index e079a7dc83..b360943455 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -835,7 +835,8 @@ static int switch_branches(const struct checkout_opts *opts, int flag, writeout_error = 0; memset(&old, 0, sizeof(old)); old.path = path_to_free = resolve_refdup("HEAD", 0, rev.hash, &flag); - old.commit = lookup_commit_reference_gently(rev.hash, 1); + if (old.path) + old.commit = lookup_commit_reference_gently(rev.hash, 1); if (!(flag & REF_ISSYMREF)) old.path = NULL; |