svn commit: r468623 - in branches/2018Q2/www/qt5-webkit: . files

[Guido Falsi]

Author: madpilot
Date: Sun Apr 29 12:14:03 2018
New Revision: 468623
URL: https://svnweb.freebsd.org/changeset/ports/468623

Log:
  MFH: r468386
  
  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
  Differential Revision:	https://reviews.freebsd.org/D15210
  
  Approved by:		ports-secteam (riggs)

Added:
  branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
     - copied unchanged from r468386, head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
Modified:
  branches/2018Q2/www/qt5-webkit/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/www/qt5-webkit/Makefile
==============================================================================
--- branches/2018Q2/www/qt5-webkit/Makefile	Sun Apr 29 11:58:58 2018	(r468622)
+++ branches/2018Q2/www/qt5-webkit/Makefile	Sun Apr 29 12:14:03 2018	(r468623)
@@ -2,7 +2,7 @@
 
 PORTNAME=		webkit
 DISTVERSION=		5.212.0-alpha2
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		www
 MASTER_SITES=		https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
 PKGNAMEPREFIX=		qt5-

Copied: branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp (from r468386, head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp	Sun Apr 29 12:14:03 2018	(r468623, copy of r468386, head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp)
@@ -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