Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint-1.6.0' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 29 Jan 2009 07:41:28 +0000
(23:41 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 29 Jan 2009 07:41:28 +0000
(23:41 -0800)
* maint-1.6.0:
avoid 31-bit truncation in write_loose_object
sha1_file.c
patch
|
blob
|
history
raw
(from parent 1:
02322e1
)
diff --git
a/sha1_file.c
b/sha1_file.c
index 52d1ead15b4db62138d9cedd5fe04068bcd10461..ce5ea12c4462eef27ddeb587b4f9937a63178adf 100644
(file)
--- 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;