diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8089d42..e932844 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.11.%{?prerel}%{?dist} +Release: 0.12.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -28,6 +28,9 @@ Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/% # https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch +# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573 +Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -221,6 +224,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Tue Oct 24 2017 Christian Dersch - 5.212.0-0.12.alpha2 +- Added patch to fix null pointer dereference (#1470778) + * Mon Oct 23 2017 Christian Dersch - 5.212.0-0.11.alpha2 - Added patch to fix issue with pagewidth (#1502332) diff --git a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch new file mode 100644 index 0000000..4cf7ae4 --- /dev/null +++ b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch @@ -0,0 +1,15 @@ +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 = page->focusController().focusedOrMainFrame().editor().selectedRange(); ++ if (!range) ++ return QString(); ++ return range->toHTML(); + } + + bool QWebPageAdapter::isContentEditable() const