diff options
| author | wicknix <39230578+wicknix@users.noreply.github.com> | 2019-04-15 18:58:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 18:58:07 -0500 |
| commit | 5a1843c9f9e323627f9c35529e6a8c853d4dbb0d (patch) | |
| tree | 62de3cd7cb8a6f75e568863bb73ca2deb80d87a9 /application/basilisk/components/sessionstore/SessionStorage.jsm | |
| parent | 065f6f9e5ebc1ed6cfaadaf7851b6021fa94a013 (diff) | |
| parent | 095ea556855b38138e39e713f482eb440f7da9b2 (diff) | |
| download | UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.gz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.lz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.xz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.zip | |
Merge pull request #1 from MoonchildProductions/master
keep up with mc
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; |