diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
| commit | 579881ffb4aa0b145c793825cd1b0628e7cd6cdc (patch) | |
| tree | 65d59fc6b73f120ac1bc2214d4a8442421076b04 /application/basilisk/components/sessionstore/SessionStorage.jsm | |
| parent | a02c44648a3f7d6f3904eebba026ce5e6f781bef (diff) | |
| parent | f71c04d814416ebf52dd54109f2d04f1cbd397c0 (diff) | |
| download | UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.gz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.lz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.xz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'application/basilisk/components/sessionstore/SessionStorage.jsm')
| -rw-r--r-- | application/basilisk/components/sessionstore/SessionStorage.jsm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/application/basilisk/components/sessionstore/SessionStorage.jsm b/application/basilisk/components/sessionstore/SessionStorage.jsm index 705139ebf..7499f95e9 100644 --- a/application/basilisk/components/sessionstore/SessionStorage.jsm +++ b/application/basilisk/components/sessionstore/SessionStorage.jsm @@ -74,7 +74,14 @@ var SessionStorageInternal = { // Get the origin of the current history entry // and use that as a key for the per-principal storage data. - let origin = principal.origin; + let origin; + try { + // The origin getter may throw for about:blank iframes as of bug 1340710, + // but we should ignore them anyway. The same goes for custom protocols. + origin = principal.origin; + } catch (e) { + return; + } if (visitedOrigins.has(origin)) { // Don't read a host twice. return; |