From: Jeff King <peff@peff.net>
Date: Fri, 29 Jan 2010 10:28:44 +0000 (-0500)
Subject: fix memcpy of overlapping area
X-Git-Tag: v1.7.0-rc1~5^2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/65d41d48a4e4e795d64dd7842a44d693b741bf31?ds=inline;hp=--cc

fix memcpy of overlapping area

Caught by valgrind in t5500, but it is pretty obvious from
reading the code that this is shifting elements of an array
to the left, which needs memmove.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

65d41d48a4e4e795d64dd7842a44d693b741bf31
diff --git a/commit.c b/commit.c
index 6393e1b362..a51d2cd1be 100644
--- a/commit.c
+++ b/commit.c
@@ -225,7 +225,7 @@ int unregister_shallow(const unsigned char *sha1)
 	if (pos < 0)
 		return -1;
 	if (pos + 1 < commit_graft_nr)
-		memcpy(commit_graft + pos, commit_graft + pos + 1,
+		memmove(commit_graft + pos, commit_graft + pos + 1,
 				sizeof(struct commit_graft *)
 				* (commit_graft_nr - pos - 1));
 	commit_graft_nr--;