diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-09-07 17:07:38 +0200 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-09 15:36:07 +1000 |
| commit | e4c8b01efc9dedc79601d80911e8d8411f5e869c (patch) | |
| tree | e50d76a6967d6a26e9d9795546b6f27bd778e5f0 | |
| parent | 92f32e3765621d29595436ae8283021cb046e8a9 (diff) | |
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
http://bugreports.qt.nokia.com/browse/QTBUG-13279
Sha1 on qtwebkit.git:
460b651cbe4f6994b492ff08614e57b0e31a24c8
Reviewed-by: Simon Hausmann
(cherry picked from commit d027395181d3e0c5796340ff87f2cddb41b93d29)
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index c09ad79117..2be6f5a420 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2010-07-08 Andreas Kling <andreas.kling@nokia.com> + + Reviewed by Oliver Hunt. + + Interpreter: Crash in op_load_varargs on 64-bit + https://bugs.webkit.org/show_bug.cgi?id=41795 + + Added missing cast of argCount to int32_t in op_load_varargs. + + * interpreter/Interpreter.cpp: + (JSC::Interpreter::privateExecute): + 2010-07-02 Peter Varga <pvarga@inf.u-szeged.hu> Reviewed by Oliver Hunt. diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp index 9e2e788e92..a56040cbea 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp @@ -3475,7 +3475,7 @@ skip_id_custom_self: argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams]; // Then we copy any additional arguments that may be further up the stack ('-1' to account for 'this') for (; i < static_cast<int32_t>(argCount); i++) - argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - argCount - 1]; + argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - static_cast<int32_t>(argCount) - 1]; } else if (!arguments.isUndefinedOrNull()) { if (!arguments.isObject()) { exceptionValue = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPC - callFrame->codeBlock()->instructions().begin(), callFrame->codeBlock()); |