From: Nguyễn Thái Ngọc Duy Date: Tue, 15 Nov 2011 06:07:56 GMT Subject: [PATCH 10/10] branch: request resolve_ref() to allocate new buffer Message-ID: <1321337276-17803-10-git-send-email-pclouds@gmail.com> In-Reply-To: <1321337276-17803-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/branch.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 43b494c..7a31b1e 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -103,7 +103,7 @@ static int branch_merged(int kind, const char *name, * safely to HEAD (or the other branch). */ struct commit *reference_rev = NULL; - const char *reference_name = NULL; + char *reference_name = NULL; int merged; if (kind == REF_LOCAL_BRANCH) { @@ -115,7 +115,7 @@ static int branch_merged(int kind, const char *name, branch->merge[0] && branch->merge[0]->dst && (reference_name = - resolve_ref(branch->merge[0]->dst, sha1, 1, NULL, 0)) != NULL) + resolve_ref(branch->merge[0]->dst, sha1, 1, NULL, 1)) != NULL) reference_rev = lookup_commit_reference(sha1); } if (!reference_rev) @@ -141,6 +141,7 @@ static int branch_merged(int kind, const char *name, " '%s', even though it is merged to HEAD."), name, reference_name); } + free(reference_name); return merged; } -- 1.7.4.74.g639db