[arch-commits] Commit in qt5-webkit/trunk (2 files)

[Antonio Rojas]

    Date: Saturday, November 4, 2017 @ 13:57:49
  Author: arojas
Revision: 308904

Fix null pointer dereference (FS#54540)

Added:
  qt5-webkit/trunk/qt5-webkit-null-pointer-dereference.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |    6 +++++-
 qt5-webkit-null-pointer-dereference.patch |   17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-04 09:17:00 UTC (rev 308903)
+++ PKGBUILD	2017-11-04 13:57:49 UTC (rev 308904)
@@ -6,7 +6,7 @@
 pkgname=qt5-webkit
 _qtver=5.212.0-alpha2
 pkgver=${_qtver/-/}
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64)
 url='http://qt-project.org/'
 license=(GPL3 LGPL3 FDL custom)
@@ -20,10 +20,12 @@
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz"
         qt5-webkit-gcc7.patch
+        qt5-webkit-null-pointer-dereference.patch
         qt5-webkit-trojita-1.patch::"https://github.com/annulen/webkit/commit/6faf1121.patch"
         qt5-webkit-trojita-2.patch::"https://github.com/annulen/webkit/commit/76420459.patch")
 sha256sums=('f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a'
             'f108833562d766d4c086026f9202b2ebc8c19e97fddedce952afed78df3c0720'
+            '510e1f78c2bcd76909703a097dbc1d5c9c6ce4cd94883c26138f09cc10121f43'
             'bd22bd7842d5ad1cb1f5a4b6acb2674509732274d5f9dc51943144dff76996ae'
             'b42b70fd2a4a36b0ff48fc4e0dc386b3dda373e6fec18f3be9f5e2d3b04e0aa3')
 
@@ -36,6 +38,8 @@
 # Fix layout issues in trojita https://github.com/annulen/webkit/issues/511
   patch -p1 -i ../qt5-webkit-trojita-1.patch
   patch -p1 -i ../qt5-webkit-trojita-2.patch
+# Fix null point dereference (Fedora) https://github.com/annulen/webkit/issues/573
+  patch -p1 -i ../qt5-webkit-null-pointer-dereference.patch
 }
 
 build() {

Added: qt5-webkit-null-pointer-dereference.patch
===================================================================
--- qt5-webkit-null-pointer-dereference.patch	                        (rev 0)
+++ qt5-webkit-null-pointer-dereference.patch	2017-11-04 13:57:49 UTC (rev 308904)
@@ -0,0 +1,17 @@
+diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 
+qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-06-09 16:11:36.000000000 +0200
++++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp	2017-10-24 21:44:40.504943501 
++0200
+@@ -390,7 +390,10 @@
+ 
+ QString QWebPageAdapter::selectedHtml() const
+ {
+-    return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
++    RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
++    if (!range)
++        return QString();
++    return range->toHTML();
+ }
+ 
+ bool QWebPageAdapter::isContentEditable() const