1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index 7947365f4..d36a824af 100644
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -218,9 +218,10 @@ int __stdcall
 check_invalid_virtual_addr (const void *s, unsigned sz)
 {
   MEMORY_BASIC_INFORMATION mbuf;
-  void *end;
+  const void *end;
 
-  for (end = (char *) s + sz; s < end; s = (char *) s + mbuf.RegionSize)
+  for (end = (char *) s + sz; s < end;
+       s = (char *) mbuf.BaseAddress + mbuf.RegionSize)
     if (!VirtualQuery (s, &mbuf, sizeof mbuf))
       return EINVAL;
   return 0;