diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-01-17 17:20:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-01-17 17:20:37 +0000 |
| commit | 895d15b81e7443a15210e61fb6083c21f7b00f4b (patch) | |
| tree | 7de49cc16394bbdb3aff284024e2284a0d39bb11 | |
| parent | 96ed5e24410a1c2d846dda794a64a4a95ddd2275 (diff) | |
| download | cygnal-895d15b81e7443a15210e61fb6083c21f7b00f4b.tar.gz cygnal-895d15b81e7443a15210e61fb6083c21f7b00f4b.tar.bz2 cygnal-895d15b81e7443a15210e61fb6083c21f7b00f4b.zip | |
* mmap.cc (mmap64): Fix condition checking if anonymous mapping beyond
EOF is required.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/mmap.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 537a19b05..50f25fee2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2009-01-17 Corinna Vinschen <corinna@vinschen.de> + * mmap.cc (mmap64): Fix condition checking if anonymous mapping beyond + EOF is required. + +2009-01-17 Corinna Vinschen <corinna@vinschen.de> + * fhandler_proc.cc: Reorganize global proc content data into a new struct proc_tab_t. Accommodate throughout. (format_proc_version): New function. diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index 53e552368..30410692f 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -897,7 +897,9 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off) WOW64 does not support the AT_ROUND_TO_PAGE flag which is required to get this right. Too bad. */ if (!wincap.is_wow64 () - && ((len > fsiz && !autogrow (flags)) || len < pagesize)) + && ((len > fsiz && !autogrow (flags)) + || roundup2 (len, getsystempagesize ()) + < roundup2 (len, pagesize))) orig_len = len; if (len > fsiz) { |