Date: Tue, 17 Apr 2018 01:39:04 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r467552 - in branches/2018Q2/www/firefox: . files Message-ID: <201804170139.w3H1d4UD082774@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Apr 17 01:39:04 2018 New Revision: 467552 URL: https://svnweb.freebsd.org/changeset/ports/467552 Log: MFH: r467551 www/firefox: crashfix if no clipboard is available Obtained from: upstream (Firefox 60) Approved by: ports-secteam blanket Added: branches/2018Q2/www/firefox/files/patch-bug1452041 - copied unchanged from r467551, head/www/firefox/files/patch-bug1452041 Modified: branches/2018Q2/www/firefox/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Tue Apr 17 01:32:23 2018 (r467551) +++ branches/2018Q2/www/firefox/Makefile Tue Apr 17 01:39:04 2018 (r467552) @@ -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/ Copied: branches/2018Q2/www/firefox/files/patch-bug1452041 (from r467551, head/www/firefox/files/patch-bug1452041) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/firefox/files/patch-bug1452041 Tue Apr 17 01:39:04 2018 (r467552, copy of r467551, head/www/firefox/files/patch-bug1452041) @@ -0,0 +1,28 @@ +commit 90944c5323c3 +Author: Martin Stransky <stransky@redhat.com> +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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804170139.w3H1d4UD082774>