diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-09 08:53:46 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-09 08:53:46 +0100 |
| commit | 8cecf8d5208f3945b35f879bba3015bb1a11bec6 (patch) | |
| tree | 0926f5c21f9d10cf929e4c35e7d7e8e8c084dbf5 /browser/base | |
| parent | 8cd777888a40e987ad536ab68421068f5c06d83b (diff) | |
| parent | 92104eb6828ba026550e1f4a3c6890c5b8254d36 (diff) | |
| download | UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.gz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.lz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.xz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'browser/base')
| -rwxr-xr-x | browser/base/content/browser.js | 2 | ||||
| -rw-r--r-- | browser/base/content/utilityOverlay.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 5a54dcc58..d813a55cc 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5688,7 +5688,7 @@ function middleMousePaste(event) { function stripUnsafeProtocolOnPaste(pasteData) { // Don't allow pasting javascript URIs since we don't support // LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL for those. - return pasteData.replace(/\r?\n/g, "").replace(/^(?:\s*javascript:)+/i, ""); + return pasteData.replace(/\r?\n/g, "").replace(/^(?:\W*javascript:)+/i, ""); } // handleDroppedLink has the following 2 overloads: diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index 7da54e064..833369f4d 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -258,6 +258,12 @@ function openLinkIn(url, where, params) { } if (!w || where == "window") { + // Strip referrer data when opening a new private window, to prevent + // regular browsing data from leaking into it. + if (aIsPrivate) { + aNoReferrer = true; + } + // This propagates to window.arguments. var sa = Cc["@mozilla.org/array;1"]. createInstance(Ci.nsIMutableArray); |