[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.16.0esr-13.5-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown

[ma1 (@ma1)]

ma1 pushed to branch base-browser-115.16.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
91df6b5c by hackademix at 2024-10-17T22:22:55+02:00
fixup! Bug 42019: Empty browser's clipboard on browser shutdown

Bug 43209: Check if any data is available before trying to retrieve it from the clipboard.

- - - - -


1 changed file:

- browser/components/BrowserGlue.sys.mjs


Changes:

=====================================
browser/components/BrowserGlue.sys.mjs
=====================================
@@ -165,8 +165,17 @@ const ClipboardPrivacy = {
     return trans;
   },
   _computeClipboardHash() {
+    const flavors = ["text/x-moz-url", "text/plain"];
+    if (
+      !Services.clipboard.hasDataMatchingFlavors(
+        flavors,
+        Ci.nsIClipboard.kGlobalClipboard
+      )
+    ) {
+      return null;
+    }
     const trans = this._createTransferable();
-    ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor);
+    flavors.forEach(trans.addDataFlavor);
     try {
       Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard);
       const clipboardContent = {};



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91df6b5c626a4056e2d23cc41097601cc9cf29fe

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91df6b5c626a4056e2d23cc41097601cc9cf29fe
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20241017/e0e26f5f/attachment-0001.htm>