MFH: r467551

www/firefox: crashfix if no clipboard is available

Obtained from:	upstream (Firefox 60)
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-04-17 01:39:04 +00:00
parent f3e7c126d2
commit 4a1e9de99f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=467552
2 changed files with 29 additions and 1 deletions

View File

@ -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/

View File

@ -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.