summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2003-07-04 09:06:54 +0000
committerCorinna Vinschen <corinna@vinschen.de>2003-07-04 09:06:54 +0000
commit6694f3054e2280f67c17e20e968fffd394e4000b (patch)
tree07597a8cdac2312b98bf644a431d301df9e6e8bc
parentbaf77a53b079f6ce9f77f6ccde3e57229720050e (diff)
downloadcygnal-6694f3054e2280f67c17e20e968fffd394e4000b.tar.gz
cygnal-6694f3054e2280f67c17e20e968fffd394e4000b.tar.bz2
cygnal-6694f3054e2280f67c17e20e968fffd394e4000b.zip
* mmap.cc (fhandler_disk_file::mmap): Fix address test.
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/mmap.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 948d6c2f6..9ecc8f60f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-04 Corinna Vinschen <corinna@vinschen.de>
+
+ * mmap.cc (fhandler_disk_file::mmap): Fix address test.
+
2003-07-03 Christopher Faylor <cgf@redhat.com>
* path.cc (fillout_mntent): Change "posix" to "managed".
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index 538ab2058..cd974bed1 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -820,7 +820,7 @@ fhandler_disk_file::mmap (caddr_t *addr, size_t len, DWORD access,
void *base = NULL;
/* If a non-zero address is given, try mapping using the given address first.
If it fails and flags is not MAP_FIXED, try again with NULL address. */
- if (addr)
+ if (*addr)
base = MapViewOfFileEx (h, access, high, low, len, *addr);
if (!base && !(flags & MAP_FIXED))
base = MapViewOfFileEx (h, access, high, low, len, NULL);