mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use xmmap_gently instead of xmmap in use_pack

Browse Source 
use_pack has its own error message on mmap error, but it can't be
reached when using xmmap, which dies with its own error.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Hommey
2019-05-16 09:37:36 +09:00
committed by Junio C Hamano
parent 8b3554279c
commit 3203566a71
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packfile.c
View File

@ -630,7 +630,7 @@ unsigned char *use_pack(struct packed_git *p,
while (packed_git_limit < pack_mapped while (packed_git_limit < pack_mapped
&& unuse_one_window(p)) && unuse_one_window(p))
; /* nothing */ ; /* nothing */
win->base = xmmap(NULL, win->len, win->base = xmmap_gently(NULL, win->len,
PROT_READ, MAP_PRIVATE, PROT_READ, MAP_PRIVATE,
p->pack_fd, win->offset); p->pack_fd, win->offset);
if (win->base == MAP_FAILED) if (win->base == MAP_FAILED)