Merge branch 'maint-1.6.0' into maint

* maint-1.6.0: avoid 31-bit truncation in write_loose_object
git-mirror · Jan 29, 2009 · 8561b52 · 8561b52
2 parents 02322e1 + 915308b
commit 8561b52
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sha1_file.c b/sha1_file.c
@@ -2337,7 +2337,8 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
 static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 			      void *buf, unsigned long len, time_t mtime)
 {
-	int fd, size, ret;
+	int fd, ret;
+	size_t size;
 	unsigned char *compressed;
 	z_stream stream;
 	char *filename;