undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "Out of memory? mmap failed" for files larger than 4GB on Windows

Browse Source 
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>
This commit is contained in:
Ian McLean 2010-05-20 20:57:51 +02:00 committed by Junio C Hamano
parent cc24a1d809
commit 60890cc60c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compat/win32mmap.c
View File

@ -4,19 +4,19 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
{ {
HANDLE hmap; HANDLE hmap;
void *temp; void *temp;
size_t len; off_t len;
struct stat st; struct stat st;
uint64_t o = offset; uint64_t o = offset;
uint32_t l = o & 0xFFFFFFFF; uint32_t l = o & 0xFFFFFFFF;
uint32_t h = (o >> 32) & 0xFFFFFFFF; uint32_t h = (o >> 32) & 0xFFFFFFFF;
if (!fstat(fd, &st)) if (!fstat(fd, &st))
len = xsize_t(st.st_size); len = st.st_size;
else else
die("mmap: could not determine filesize"); die("mmap: could not determine filesize");
if ((length + offset) > len) if ((length + offset) > len)
length = len - offset; length = xsize_t(len - offset);
if (!(flags & MAP_PRIVATE)) if (!(flags & MAP_PRIVATE))
die("Invalid usage of mmap when built with USE_WIN32_MMAP"); die("Invalid usage of mmap when built with USE_WIN32_MMAP");