svn commit: r468386 - in head/www/qt5-webkit: . files

[Guido Falsi]

Author: madpilot
Date: Thu Apr 26 21:04:46 2018
New Revision: 468386
URL: https://svnweb.freebsd.org/changeset/ports/468386

Log:
  Import upstream commit fixing a crash caused by a null pointer
  dereference.
  
  Approved by:		kde (tcberner)
  Obtained from:		https://github.com/annulen/webkit/commit/0e75f3272d149bc64899c161f150eb341a2417af
  MFH:			2018Q2
  Differential Revision:	https://reviews.freebsd.org/D15210

Added:
  head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp   (contents, props changed)
Modified:
  head/www/qt5-webkit/Makefile

Modified: head/www/qt5-webkit/Makefile
==============================================================================
--- head/www/qt5-webkit/Makefile	Thu Apr 26 20:43:14 2018	(r468385)
+++ head/www/qt5-webkit/Makefile	Thu Apr 26 21:04:46 2018	(r468386)
@@ -2,7 +2,7 @@
 
 PORTNAME=		webkit
 DISTVERSION=		5.212.0-alpha2
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		www
 MASTER_SITES=		https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
 PKGNAMEPREFIX=		qt5-

Added: head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp	Thu Apr 26 21:04:46 2018	(r468386)
@@ -0,0 +1,18 @@
+Fix crash in QWebPage::selectedHtml() when selectedRange is nullptr
+
+obtained from: https://github.com/annulen/webkit/commit/0e75f3272d149bc64899c161f150eb341a2417af
+
+--- Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp.orig	2017-06-09 14:11:36 UTC
++++ Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+@@ -390,7 +390,10 @@ QString QWebPageAdapter::selectedText() const
+ 
+ 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