From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sat, 25 May 2013 09:08:17 +0000 (+0200)
Subject: add_existing(): do not retain a reference to sha1
X-Git-Tag: v1.8.4-rc0~170^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f83918edcb6fbcd1c5d8378c11e57edcc47bd232;p=git-core%2Fgit.git

add_existing(): do not retain a reference to sha1

Its lifetime is not guaranteed, so make a copy.  Free the memory when
the string_list is cleared.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 48df5fa48..fa6fe4414 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -571,7 +571,8 @@ static int add_existing(const char *refname, const unsigned char *sha1,
 {
 	struct string_list *list = (struct string_list *)cbdata;
 	struct string_list_item *item = string_list_insert(list, refname);
-	item->util = (void *)sha1;
+	item->util = xmalloc(20);
+	hashcpy(item->util, sha1);
 	return 0;
 }
 
@@ -636,7 +637,7 @@ static void find_non_local_tags(struct transport *transport,
 		item = string_list_insert(&remote_refs, ref->name);
 		item->util = (void *)ref->old_sha1;
 	}
-	string_list_clear(&existing_refs, 0);
+	string_list_clear(&existing_refs, 1);
 
 	/*
 	 * We may have a final lightweight tag that needs to be
@@ -782,7 +783,7 @@ static int do_fetch(struct transport *transport,
 	}
 
  cleanup:
-	string_list_clear(&existing_refs, 0);
+	string_list_clear(&existing_refs, 1);
 	return retcode;
 }