From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 19 Sep 2007 22:42:10 +0000 (+0200)
Subject: Fix the expansion pattern of the pseudo-static path buffer.
X-Git-Tag: v1.5.4-rc0~387^2~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e03e05ff73a6f6b4f32eb5cd13b4f1e43275e42f;p=git.git

Fix the expansion pattern of the pseudo-static path buffer.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/archive-tar.c b/archive-tar.c
index a87bc4b83..e1bced560 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -238,15 +238,14 @@ static int write_tar_entry(const unsigned char *sha1,
                            const char *filename, unsigned mode, int stage)
 {
 	static struct strbuf path = STRBUF_INIT;
-	int filenamelen = strlen(filename);
 	void *buffer;
 	enum object_type type;
 	unsigned long size;
 
-	strbuf_grow(&path, MAX(PATH_MAX, baselen + filenamelen + 1));
 	strbuf_reset(&path);
+	strbuf_grow(&path, PATH_MAX);
 	strbuf_add(&path, base, baselen);
-	strbuf_add(&path, filename, filenamelen);
+	strbuf_addstr(&path, filename);
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
 		strbuf_addch(&path, '/');
 		buffer = NULL;