1 files changed, 14 insertions, 3 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 2280f82b1a1..d4c14e29563 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -254,9 +254,20 @@ stack_info::walk ()
   sf.AddrReturn.Offset = (DWORD) *++ebp;
 
   if (needargs)
-    /* The arguments follow the return address */
-    for (unsigned i = 0; i < NPARAMS; i++)
-      sf.Params[i] = (DWORD) *++ebp;
+    {
+      unsigned nparams = NPARAMS;
+
+      /* The arguments follow the return address */
+      sf.Params[0] = (DWORD) *++ebp;
+      /* Hack for XP/2K3 WOW64.  If the first stack param points to the
+	 application entry point, we can only fetch one additional
+	 parameter.  Accessing anything beyond this address results in
+	 a SEGV.  This is fixed in Vista/2K8 WOW64. */
+      if (wincap.has_restricted_stack_args () && sf.Params[0] == 0x401000)
+	nparams = 2;
+      for (unsigned i = 1; i < nparams; i++)
+	sf.Params[i] = (DWORD) *++ebp;
+    }
 
   return 1;
 }