diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-28 14:28:36 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-28 15:38:55 (GMT) |
commit | ffeb75fe970dadbf2b5e5a96bc63ba0a53fb6be5 (patch) | |
tree | 4b366cc9bac8e8609c71f4671b32c574e0ce4639 /src/script/api/qscriptengine_p.h | |
parent | 4efaf156223cd12f799164a479929f78a9b5db95 (diff) | |
download | Qt-ffeb75fe970dadbf2b5e5a96bc63ba0a53fb6be5.zip Qt-ffeb75fe970dadbf2b5e5a96bc63ba0a53fb6be5.tar.gz Qt-ffeb75fe970dadbf2b5e5a96bc63ba0a53fb6be5.tar.bz2 |
QScript: Fix strange bugs and crashes.
I was assuming that the default return value register was always set
to 0 for native calls. But this is not the case. So we must ensure this.
Also be consistend in the way the stackframe grow and shrink. This expose
another bug in the way the call frame is created in JSC
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
-rw-r--r-- | src/script/api/qscriptengine_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index c43ca61..b8b805e 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -170,7 +170,8 @@ public: enum ContextFlags { NativeContext = 1, CalledAsConstructorContext = 2, - HasScopeContext = 4 + HasScopeContext = 4, // Specifies that the is a QScriptActivationObject + ShouldRestoreCallFrame = 8 }; static uint contextFlags(JSC::ExecState *); static void setContextFlags(JSC::ExecState *, uint); |