wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 834618 - Catch any error thrown from resolveFromOrigin. r=fabrice

Browse Source
This commit is contained in:
Julien Wajsberg 2013-02-04 14:59:32 +01:00
parent 9ba4883ad2
commit 805b871ccd
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dom/apps/src/Webapps.jsm
View File

@ -461,7 +461,15 @@ this.DOMApplicationRegistry = {
let messageName; let messageName;
if (typeof(aMessage) === "object" && Object.keys(aMessage).length === 1) { if (typeof(aMessage) === "object" && Object.keys(aMessage).length === 1) {
messageName = Object.keys(aMessage)[0]; messageName = Object.keys(aMessage)[0];
href = Services.io.newURI(manifest.resolveFromOrigin(aMessage[messageName]), null, null); let uri;
try {
uri = manifest.resolveFromOrigin(aMessage[messageName]);
} catch(e) {
debug("system message url (" + aMessage[messageName] + ") is invalid, skipping. " +
"Error is: " + e);
return;
}
href = Services.io.newURI(uri, null, null);
} else { } else {
messageName = aMessage; messageName = aMessage;
} }
@ -506,7 +514,17 @@ this.DOMApplicationRegistry = {
if (!description.href) { if (!description.href) {
description.href = manifest.launch_path; description.href = manifest.launch_path;
} }
description.href = manifest.resolveFromOrigin(description.href);
try {
description.href = manifest.resolveFromOrigin(description.href);
} catch (e) {
debug("Activity href (" + description.href + ") is invalid, skipping. " +
"Error is: " + e);
continue;
}
debug('_createActivitiesToRegister: ' + aApp.manifestURL + ', activity ' +
activity + ', description.href is ' + description.href);
if (aRunUpdate) { if (aRunUpdate) {
activitiesToRegister.push({ "manifest": aApp.manifestURL, activitiesToRegister.push({ "manifest": aApp.manifestURL,