login
Header Space

 
 

Re: [PATCH] git-archive: convert archive entries like checkouts do

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Daniel Barkalow <barkalow@...>, Junio C Hamano <junkio@...>
Cc: Johan Herland <johan@...>, <git@...>, Frank Lichtenheld <frank@...>, Thomas Glanzmann <thomas@...>, Michael Gernoth <simigern@...>
Date: Friday, May 18, 2007 - 6:58 pm

Daniel Barkalow schrieb:
[...]

Thank you for spotting this.  Fix-up patch below.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>

---
Embarrassing.  I'm off to go to sleep now.

 archive-tar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive-tar.c b/archive-tar.c
index eb0abc7..33e7657 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -82,7 +82,7 @@ static void strbuf_append_string(struct strbuf *sb, const char *s)
 {
 	int slen = strlen(s);
 	int total = sb->len + slen;
-	if (total > sb->alloc) {
+	if (total + 1 > sb->alloc) {
 		sb->buf = xrealloc(sb->buf, total + 1);
 		sb->alloc = total + 1;
 	}
@@ -271,7 +271,7 @@ static int write_tar_entry(const unsigned char *sha1,
 		path.alloc = PATH_MAX;
 		path.len = path.eof = 0;
 	}
-	if (path.alloc < baselen + filenamelen) {
+	if (path.alloc < baselen + filenamelen + 1) {
 		free(path.buf);
 		path.buf = xmalloc(baselen + filenamelen + 1);
 		path.alloc = baselen + filenamelen + 1;
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Commit ID in exported Tar Ball, Thomas Glanzmann, (Thu May 17, 12:38 pm)
Re: Commit ID in exported Tar Ball, , (Thu May 17, 1:02 pm)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Thu May 17, 1:13 pm)
Re: Commit ID in exported Tar Ball, Johan Herland, (Thu May 17, 12:57 pm)
Re: Commit ID in exported Tar Ball, Frank Lichtenheld, (Thu May 17, 1:48 pm)
Re: Commit ID in exported Tar Ball, Johan Herland, (Thu May 17, 2:05 pm)
Re: Commit ID in exported Tar Ball, Frank Lichtenheld, (Thu May 17, 1:11 pm)
Re: Commit ID in exported Tar Ball, , (Sat May 19, 4:22 pm)
Re: Commit ID in exported Tar Ball, Junio C Hamano, (Sat May 19, 5:00 pm)
Re: Commit ID in exported Tar Ball, , (Sat May 19, 8:15 pm)
Re: Commit ID in exported Tar Ball, , (Sun May 20, 7:20 am)
Re: Commit ID in exported Tar Ball, A Large Angry SCM, (Sat May 19, 5:39 pm)
Re: Commit ID in exported Tar Ball, Shawn O. Pearce, (Sat May 19, 11:57 pm)
Re: Commit ID in exported Tar Ball, , (Sun May 20, 7:20 am)
Re: Commit ID in exported Tar Ball, , (Sun May 20, 7:20 am)
Re: Commit ID in exported Tar Ball, Shawn O. Pearce, (Mon May 21, 2:02 am)
Re: Commit ID in exported Tar Ball, , (Mon May 21, 3:54 pm)
Re: Commit ID in exported Tar Ball, , (Tue May 22, 6:26 pm)
Re: Commit ID in exported Tar Ball, Junio C Hamano, (Tue May 22, 6:54 pm)
Re: Commit ID in exported Tar Ball, , (Tue May 22, 7:44 pm)
Re: Commit ID in exported Tar Ball, Shawn O. Pearce, (Wed May 23, 1:22 am)
Re: Commit ID in exported Tar Ball, Petr Baudis, (Mon May 21, 8:09 am)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Sun May 20, 12:10 pm)
Re: Commit ID in exported Tar Ball, Brian Gernhardt, (Sun May 20, 12:28 pm)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Sun May 20, 12:30 pm)
Re: Commit ID in exported Tar Ball, Shawn O. Pearce, (Mon May 21, 2:29 am)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Mon May 21, 2:37 am)
Re: Commit ID in exported Tar Ball, Brian Gernhardt, (Mon May 21, 2:56 am)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Mon May 21, 3:02 am)
Re: Commit ID in exported Tar Ball, Shawn O. Pearce, (Mon May 21, 2:53 am)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Mon May 21, 3:00 am)
Re: Commit ID in exported Tar Ball, Peter Baumann, (Mon May 21, 2:19 am)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Mon May 21, 2:24 am)
Re: Commit ID in exported Tar Ball, Johan Herland, (Thu May 17, 1:28 pm)
Re: [PATCH] git-archive: convert archive entries like checko..., , (Fri May 18, 6:58 pm)
Re: Commit ID in exported Tar Ball, Thomas Glanzmann, (Thu May 17, 1:14 pm)
speck-geostationary