[PATCH 095/104] Fix "Out of memory? mmap failed" for files larger than 4GB on Windows
- From
Sam Vilain <sam.vilain@catalyst.net.nz>
- Date
- May 26, 2010, 06:01 UTC
- Message-ID
- <1274853674-18521-95-git-send-email-sam.vilain@catalyst.net.nz>
- In-Reply-To
- <1274853674-18521-1-git-send-email-sam.vilain@catalyst.net.nz>
From: Ian McLean <ian.mclean@gmail.com>
The git_mmap implementation was broken for file sizes that wouldn't fit into a size_t (32 bits). This was caused by intermediate variables that were only 32 bits wide when they should be 64 bits.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- compat/win32mmap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/compat/win32mmap.c b/compat/win32mmap.c index 1c5a149..b58aa69 100644 --- a/compat/win32mmap.c +++ b/compat/win32mmap.c @@ -4,19 +4,19 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of { HANDLE hmap; void *temp; - size_t len; + off_t len; struct stat st; uint64_t o = offset; uint32_t l = o & 0xFFFFFFFF; uint32_t h = (o >> 32) & 0xFFFFFFFF; if (!fstat(fd, &st)) - len = xsize_t(st.st_size); + len = st.st_size; else die("mmap: could not determine filesize"); if ((length + offset) > len) - length = len - offset; + length = xsize_t(len - offset); if (!(flags & MAP_PRIVATE)) die("Invalid usage of mmap when built with USE_WIN32_MMAP");
-- 1.7.1.rc2.333.gb2668