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

Bug 329521: check image url before viewing image, patch by Martijn Wargers <martijn.martijn@gmail.com>, r=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@195861 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com 2006-05-03 00:27:40 +00:00
parent a8caf879df
commit af6e79377e
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/browser/base/content/browser.js
View File

@ -4599,12 +4599,30 @@ nsContextMenu.prototype = {
// Change current window to the URL of the image.
viewImage : function (e) {
urlSecurityCheck( this.imageURL, this.docURL );
openUILink( this.imageURL, e );
try {
if (this.docURL != gBrowser.currentURI) {
const secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(Components.interfaces.nsIScriptSecurityManager);
const nsIScriptSecMan = Components.interfaces.nsIScriptSecurityManager;
secMan.checkLoadURI(gBrowser.currentURI, makeURI(this.imageURL),
nsIScriptSecMan.DISALLOW_SCRIPT);
}
openUILink( this.imageURL, e );
} catch(e) {}
},
// Change current window to the URL of the background image.
viewBGImage : function (e) {
urlSecurityCheck( this.bgImageURL, this.docURL );
openUILink( this.bgImageURL, e );
try {
if (this.docURL != gBrowser.currentURI) {
const secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(Components.interfaces.nsIScriptSecurityManager);
const nsIScriptSecMan = Components.interfaces.nsIScriptSecurityManager;
secMan.checkLoadURI(gBrowser.currentURI, makeURI(this.bgImageURL),
nsIScriptSecMan.DISALLOW_SCRIPT);
}
openUILink( this.bgImageURL, e );
} catch(e) {}
},
disableSetDesktopBackground: function() {
// Disable the Set as Desktop Background menu item if we're still trying