[gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit/files: qt-webkit-4.5.3-no-javascript-crash.patch

[Alex Alexander (wired)]

wired       10/02/17 21:20:01

  Added:                qt-webkit-4.5.3-no-javascript-crash.patch
  Log:
  [x11-libs/qt-webkit-4.5.3-r2] added patch that fixes arora's no-javascript crash
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.5.3-no-javascript-crash.patch?rev=1.1&content-type=text/plain

Index: qt-webkit-4.5.3-no-javascript-crash.patch
===================================================================
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -317,4 +317,6 @@
     javaScriptWindowObjectCleared() signal.
 
+    If Javascript is not enabled for this page, then this method does nothing.
+
     The \a object will never be explicitly deleted by QtWebKit.
 */
@@ -339,8 +341,13 @@
     javaScriptWindowObjectCleared() signal.
 
+    If Javascript is not enabled for this page, then this method does nothing.
+
     The ownership of \a object is specified using \a own.
 */
 void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership)
 {
+    if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled))
+        return;
+
     JSC::JSLock lock(false);
     JSDOMWindow* window = toJSDOMWindow(d->frame);