Attachment 199825 Details for Bug 113434 – Patch

[patch] Patch

bug-113434-20130426153843.patch (text/plain), 2.39 KB, created by Allan Sandfeld Jensen on 2013-04-26 06:39:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Allan Sandfeld Jensen

Created: 2013-04-26 06:39:23 PDT

Size: 2.39 KB

patch

obsolete

>Subversion Revision: 149181
>diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
>index c32bd0cc8fbc0ff4bb9dee1afae5cd93e49a0178..2381d42838dcb43abb1d3612fdd3c3814ea07174 100644
>--- a/Source/WebKit/qt/ChangeLog
>+++ b/Source/WebKit/qt/ChangeLog
>@@ -1,3 +1,18 @@
>+2013-04-26  Allan Sandfeld Jensen  <allan.jensen@digia.com>
>+
>+        Crash when calling QWebFrame::evaluateJavaScript
>+        https://bugs.webkit.org/show_bug.cgi?id=113434
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We need to also hold the JSLock when calling convertValueToQVariant.
>+        It is currently only held during evaluation.
>+
>+        * Api/qwebelement.cpp:
>+        (QWebElement::evaluateJavaScript):
>+        * WebCoreSupport/QWebFrameAdapter.cpp:
>+        (QWebFrameAdapter::evaluateJavaScript):
>+
> 2013-04-25  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: ConsoleMessage should include line and column number where possible
>diff --git a/Source/WebKit/qt/Api/qwebelement.cpp b/Source/WebKit/qt/Api/qwebelement.cpp
>index 1974d4cce6b84f59048304877ca95c5a1302c3cc..109d1121846a757656ab3f2542fea85ddb751482 100644
>--- a/Source/WebKit/qt/Api/qwebelement.cpp
>+++ b/Source/WebKit/qt/Api/qwebelement.cpp
>@@ -760,6 +760,7 @@ QVariant QWebElement::evaluateJavaScript(const QString& scriptSource)
>         return QVariant();
> 
>     int distance = 0;
>+    JSC::JSLockHolder lock(state);
>     JSValueRef* ignoredException = 0;
>     return JSC::Bindings::convertValueToQVariant(toRef(state), toRef(state, evaluationResult), QMetaType::Void, &distance, ignoredException);
> }
>diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
>index 393cc3789459d3bc2b9a6631aa6b0ac06dcb793e..0509c03bb2b188100bb54a598865a9b1e8fb3e36 100644
>--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
>+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
>@@ -203,6 +203,7 @@ QVariant QWebFrameAdapter::evaluateJavaScript(const QString &scriptSource)
>         int distance = 0;
>         JSC::JSValue v = frame->script()->executeScript(ScriptSourceCode(scriptSource)).jsValue();
>         JSC::ExecState* exec = proxy->globalObject(mainThreadNormalWorld())->globalExec();
>+        JSC::JSLockHolder lock(exec);
>         JSValueRef* ignoredException = 0;
>         rc = JSC::Bindings::convertValueToQVariant(toRef(exec), toRef(exec, v), QMetaType::Void, &distance, ignoredException);
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 113434: 199825 | 200310 | 200894