From db44ad2be915fc00faba77bd9b1d19e3ec53b42c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Thu, 11 Sep 2014 17:00:06 +0200
Subject: [PATCH] Fix stack size check on systems with less than 256kb stack
We require at least 256 kbytes slack stack space, and if a system is
configured with less (or equal), then the stack size checks fail early on
and strange error message occur during engine startup and execution.
This patch calls the stack check code early on and bails out with an error
message that's more descriptive.
Change-Id: I3263f2f93f62332d08003411e1bb5b3b1140d02b
Task-number: QTBUG-41213
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
src/qml/jsruntime/qv4engine.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 88cd043d1e..ea075f9cbd 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -90,6 +90,8 @@ static ReturnedValue throwTypeError(CallContext *ctx)
return ctx->throwTypeError();
}
+const int MinimumStackSize = 256; // in kbytes
+
quintptr getStackLimit()
{
quintptr stackLimit;
@@ -149,7 +151,7 @@ quintptr getStackLimit()
#endif
// 256k slack
- return stackLimit + 256*1024;
+ return stackLimit + MinimumStackSize*1024;
}
@@ -203,6 +205,8 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
// set up stack limits
jsStackLimit = jsStackBase + JSStackLimit/sizeof(Value);
cStackLimit = getStackLimit();
+ if (!recheckCStackLimits())
+ qFatal("Fatal: Not enough stack space available for QML. Please increase the process stack size to more than %d KBytes.", MinimumStackSize);
Scope scope(this);
--
GitLab