diff options
| author | Stefan Sperling <stsp@openbsd.org> | 2014-11-03 13:46:56 +0100 |
|---|---|---|
| committer | Carlos MartÃn Nieto <cmn@dwim.me> | 2014-11-03 13:49:04 +0100 |
| commit | aad0bd6bc78b79bb8c0778c0c135c167d359fe12 (patch) | |
| tree | b6eb65020b688f52c0870b67369fe47a4e4dd0d4 | |
| parent | ea8dedc953919fa3f7a014ee1e0386f84ed326f1 (diff) | |
| download | libgit2-cmn/mmap-readable.tar.gz | |
Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readable
A non-readable mapping of a file causes an access violation in
the pack tests. Always use PROT_READ to work around this.
| -rw-r--r-- | src/unix/map.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/unix/map.c b/src/unix/map.c index 0a235d5a1..87ee6594b 100644 --- a/src/unix/map.c +++ b/src/unix/map.c @@ -26,7 +26,7 @@ int git__page_size(size_t *page_size) int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) { - int mprot = 0; + int mprot = PROT_READ; int mflag = 0; GIT_MMAP_VALIDATE(out, len, prot, flags); @@ -35,9 +35,7 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs out->len = 0; if (prot & GIT_PROT_WRITE) - mprot = PROT_WRITE; - else if (prot & GIT_PROT_READ) - mprot = PROT_READ; + mprot |= PROT_WRITE; if ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED) mflag = MAP_SHARED; |