Bug 1452041 - nsClipboard::HasDataMatchingFlavors(): return immediately when there's no clipboard content, r?jhorak draft
authorMartin Stransky <stransky@redhat.com>
Mon, 09 Apr 2018 13:36:03 +0200
changeset 779164 df447aeebfb333718e79941223d6e674df1c7e17
parent 777913 a2cc239477a3233aeb01bcc7318d53bd4fd788fd
push id105679
push userstransky@redhat.com
push dateMon, 09 Apr 2018 11:42:45 +0000
reviewersjhorak
bugs1452041
milestone61.0a1
Bug 1452041 - nsClipboard::HasDataMatchingFlavors(): return immediately when there's no clipboard content, r?jhorak MozReview-Commit-ID: CTz0tRr3p57
widget/gtk/nsClipboard.cpp
--- a/widget/gtk/nsClipboard.cpp
+++ b/widget/gtk/nsClipboard.cpp
@@ -391,16 +391,18 @@ nsClipboard::HasDataMatchingFlavors(cons
 {
   if (!aFlavorList || !_retval)
       return NS_ERROR_NULL_POINTER;
 
   *_retval = false;
 
   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.
   for (uint32_t i = 0; i < aLength && !*_retval; i++) {
       // We special case text/unicode here.
       if (!strcmp(aFlavorList[i], kUnicodeMime) &&
           gtk_targets_include_text(targets, targetNums)) {
           *_retval = true;