mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 13:15:10 +02:00
Code

Merge branch 'rs/git-mmap-uses-malloc' into maint 

mmap() imitation used to call xmalloc() that dies upon malloc()
failure, which has been corrected to just return an error to the
caller to be handled.

* rs/git-mmap-uses-malloc:
  compat: let git_mmap use malloc(3) directly
This commit is contained in:
Junio C Hamano 2021-10-12 13:51:39 -07:00
parent 3fb1d4da5e 95b4ff3931
commit ae9e6ef35e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/mmap.c
View File

@ -7,7 +7,12 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
if (start != NULL || flags != MAP_PRIVATE || prot != PROT_READ)
die("Invalid usage of mmap when built with NO_MMAP");
start = xmalloc(length);
if (length == 0) {
errno = EINVAL;
return MAP_FAILED;
}
start = malloc(length);
if (start == NULL) {
errno = ENOMEM;
return MAP_FAILED;