From owner-svn-ports-all@freebsd.org Sun Apr 29 12:14:04 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B7DCFAB75D; Sun, 29 Apr 2018 12:14:04 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B0A482D8E; Sun, 29 Apr 2018 12:14:04 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E042124327; Sun, 29 Apr 2018 12:14:03 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3TCE3Gq035986; Sun, 29 Apr 2018 12:14:03 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3TCE3l1035984; Sun, 29 Apr 2018 12:14:03 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201804291214.w3TCE3l1035984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 29 Apr 2018 12:14:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r468623 - in branches/2018Q2/www/qt5-webkit: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2018Q2/www/qt5-webkit: . files X-SVN-Commit-Revision: 468623 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2018 12:14:04 -0000 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 = page->focusController().focusedOrMainFrame().editor().selectedRange(); ++ if (!range) ++ return QString(); ++ return range->toHTML(); + } + + bool QWebPageAdapter::isContentEditable() const