Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 301119 - Need to allow chrome favicons for XUL error pages, SeaMonkey version, p=hskupin@gmail.com r=Neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251894 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kairo%kairo.at
2008-05-28 18:35:09 +00:00
parent 758066e633
commit c8d6b84b89
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/suite/browser/tabbrowser.xml
View File

@@ -972,10 +972,6 @@
const nsIScriptSecurityManager =
Components.interfaces.nsIScriptSecurityManager;
const secMan =
Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(nsIScriptSecurityManager);
// Get the IOService so we can make URIs
const ioService =
Components.classes["@mozilla.org/network/io-service;1"]
@@ -985,11 +981,23 @@
// Make a URI out of our href.
var uri = ioService.newURI(href, targetDoc.characterSet, null);
try {
secMan.checkLoadURIWithPrincipal(event.target.nodePrincipal, uri,
nsIScriptSecurityManager.DISALLOW_SCRIPT);
} catch (e) {
return;
// Verify that the load of this icon is legal.
// error pages can load their favicon, to be on the safe side,
// only allow chrome:// favicons
const aboutNeterr = /^about:neterror\?/;
if (!(aboutNeterr.test(targetDoc.documentURI) ||
!uri.schemeIs("chrome")) {
const secMan =
Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(nsIScriptSecurityManager);
try {
secMan.checkLoadURIWithPrincipal(event.target.nodePrincipal,
uri, nsIScriptSecurityManager.DISALLOW_SCRIPT);
} catch(e) {
return;
}
}
if (isFeed) {