security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-05-19 19:02:21 +02:00
Code Releases Activity

Secured getWrapped from weird errors (Unexpected object).

Browse Source 
Fixes #133
This commit is contained in:
kkapsner 2017-10-10 21:11:05 +02:00
parent c5872ef5a1
commit 68fb7730b9
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/require.js
View File

@ -2,16 +2,29 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
window.scope = {}; const require = function(){
function require(module){
"use strict"; "use strict";
window.scope = {};
const scope = window.scope;
function require(module){
if (module.startsWith("./")){ if (module.startsWith("./")){
var scopeName = module.substr(2).replace(/\..+/, ""); var scopeName = module.substr(2).replace(/\..+/, "");
return window.scope[scopeName]; return scope[scopeName];
} }
else if (module === "sdk/getWrapped"){ else if (module === "sdk/getWrapped"){
return function getWrapped(obj){ return function getWrapped(obj){
return obj.wrappedJSObject || obj; if (!obj){
return obj;
}
var wrapped;
try {
wrapped = obj.wrappedJSObject || obj;
}
catch (e){
require("./logging").error("getWrapped failed for", obj, ":", e);
wrapped = obj;
}
return wrapped;
}; };
} }
else if (module === "sdk/simple-prefs"){ else if (module === "sdk/simple-prefs"){
@ -29,6 +42,7 @@ function require(module){
}; };
} }
throw new ReferenceError("Unable to get non relative module " + module + "!"); throw new ReferenceError("Unable to get non relative module " + module + "!");
} }
window.scope.require = require; return require;
}();