From: Jeff King <peff@peff.net>
Date: Thu, 23 Oct 2008 04:32:23 +0000 (+0000)
Subject: fix overlapping memcpy in normalize_absolute_path
X-Git-Tag: v1.6.0.4~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1442171bc913a9cddae5c6ad0d0a4be3a1ca86e8;p=git.git

fix overlapping memcpy in normalize_absolute_path

The comments for normalize_absolute_path explicitly claim
that the source and destination buffers may be the same
(though they may not otherwise overlap). Thus the call to
memcpy may involve copying overlapping data, and memmove
should be used instead.

This fixes a valgrind error in t1504.

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

diff --git a/path.c b/path.c
index 76e887262..c1cb54b7b 100644
--- a/path.c
+++ b/path.c
@@ -348,7 +348,7 @@ int normalize_absolute_path(char *buf, const char *path)
 			goto next;
 		}
 
-		memcpy(dst, comp_start, comp_len);
+		memmove(dst, comp_start, comp_len);
 		dst += comp_len;
 	next:
 		comp_start = comp_end;