From owner-svn-ports-head@freebsd.org Tue Apr 17 01:32:24 2018 Return-Path: Delivered-To: svn-ports-head@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 E9F55F90359; Tue, 17 Apr 2018 01:32:23 +0000 (UTC) (envelope-from jbeich@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 9CD7C7EB95; Tue, 17 Apr 2018 01:32:23 +0000 (UTC) (envelope-from jbeich@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 97C8D2554A; Tue, 17 Apr 2018 01:32:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3H1WNrh082408; Tue, 17 Apr 2018 01:32:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3H1WNPw082406; Tue, 17 Apr 2018 01:32:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804170132.w3H1WNPw082406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Apr 2018 01:32:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467551 - in head/www/firefox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/www/firefox: . files X-SVN-Commit-Revision: 467551 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 01:32:24 -0000 Author: jbeich Date: Tue Apr 17 01:32:23 2018 New Revision: 467551 URL: https://svnweb.freebsd.org/changeset/ports/467551 Log: www/firefox: crashfix if no clipboard is available Obtained from: upstream (Firefox 60) Added: head/www/firefox/files/patch-bug1452041 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Apr 17 00:47:05 2018 (r467550) +++ head/www/firefox/Makefile Tue Apr 17 01:32:23 2018 (r467551) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 59.0.2 -PORTREVISION= 4 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/ Added: head/www/firefox/files/patch-bug1452041 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1452041 Tue Apr 17 01:32:23 2018 (r467551) @@ -0,0 +1,28 @@ +commit 90944c5323c3 +Author: Martin Stransky +Date: Mon Apr 9 13:36:03 2018 +0200 + + Bug 1452041 - nsClipboard::HasDataMatchingFlavors(): return immediately when there's no clipboard content, r=jhorak a=jcristau + + MozReview-Commit-ID: CTz0tRr3p57 + + --HG-- + extra : rebase_source : 35453506a58e698d8f0b6e9681fb87da8511eb9c + extra : source : 4b841d1c7ec0513eb080fb033f54bde12ccb7ddc +--- + widget/gtk/nsClipboard.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git widget/gtk/nsClipboard.cpp widget/gtk/nsClipboard.cpp +index 36e8d6ad5cee..61d3ef53ca98 100644 +--- widget/gtk/nsClipboard.cpp ++++ widget/gtk/nsClipboard.cpp +@@ -390,6 +390,8 @@ nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, uint32_t aLength, + + int targetNums; + GdkAtom* targets = mContext->GetTargets(aWhichClipboard, &targetNums); ++ if (!targets) ++ return NS_OK; + + // Walk through the provided types and try to match it to a + // provided type.