From 7cdad186b61a67a09cfa83fbd9a7073dbf89cb53 Mon Sep 17 00:00:00 2001
From: "pedemont%us.ibm.com"
 <pedemont%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 11 Oct 2005 16:50:27 +0000
Subject: [PATCH] Bug 309337 - Make sure reserving 512k in stack space doesn't
 cause unsigned stacklimit var to wrap. r=brendan, sr=jst

git-svn-id: svn://10.0.0.236/trunk@181993 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dom/src/base/nsJSEnvironment.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index 385b981360b..bb0948cf822 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -666,12 +666,17 @@ GetThreadStackLimit()
     int stackDummy;
     jsuword currentStackAddr = (jsuword)&stackDummy;
 
-    // We assume here that the stack grows down, and that a stack
-    // limit of 512k below the current stack addr is ok. If this is
-    // not the case on some platforms, #ifdef's are needed for those
-    // platforms.
-    sThreadStackLimit = currentStackAddr +
-      (0x80000 * JS_STACK_GROWTH_DIRECTION);
+    const jsuword kStackSize = 0x80000;   // 512k
+
+#if JS_STACK_GROWTH_DIRECTION < 0
+    sThreadStackLimit = (currentStackAddr > kStackSize)
+                        ? currentStackAddr - kStackSize
+                        : 0;
+#else
+    sThreadStackLimit = (currentStackAddr + kStackSize > currentStackAddr)
+                        ? currentStackAddr + kStackSize
+                        : (jsuword) -1;
+#endif
   }
 
   return sThreadStackLimit;