From 60890cc60ccfc7000791a47f1f3d69fdb8884dd7 Mon Sep 17 00:00:00 2001 From: Ian McLean Date: Thu, 20 May 2010 20:57:51 +0200 Subject: [PATCH] Fix "Out of memory? mmap failed" for files larger than 4GB on Windows 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 Signed-off-by: Junio C Hamano --- compat/win32mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat/win32mmap.c b/compat/win32mmap.c index 1c5a14922..b58aa69fa 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"); -- 2.30.2