security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-02-01 16:24:37 +01:00
Code Releases Activity

Only check for prototype loops when there is a prototype

Browse Source 
For #705
This commit is contained in:
kkapsner 2024-04-17 00:07:16 +02:00
parent bebcec2139
commit 3eedc7b7dc
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/extension.js
View File

@ -179,6 +179,7 @@
if (proxies.has(prototype)){ if (proxies.has(prototype)){
prototype = proxies.get(prototype).wrappedOriginal; prototype = proxies.get(prototype).wrappedOriginal;
} }
if (prototype){
const grandPrototype = wrappedReflect.getPrototypeOf(prototype); const grandPrototype = wrappedReflect.getPrototypeOf(prototype);
if (proxies.has(grandPrototype)){ if (proxies.has(grandPrototype)){
const testPrototype = wrappedWindow.Object.create(proxies.get(grandPrototype).wrappedOriginal); const testPrototype = wrappedWindow.Object.create(proxies.get(grandPrototype).wrappedOriginal);
@ -187,6 +188,7 @@
return false; return false;
} }
} }
}
const value = originalReflectSetPrototypeOf.call(wrappedReflect, target, scope.getWrapped(prototype)); const value = originalReflectSetPrototypeOf.call(wrappedReflect, target, scope.getWrapped(prototype));
return value; return value;
}, window, "setPrototypeOf" }, window, "setPrototypeOf"
@ -225,11 +227,13 @@
if (proxies.has(prototype)){ if (proxies.has(prototype)){
prototype = proxies.get(prototype).wrappedOriginal; prototype = proxies.get(prototype).wrappedOriginal;
} }
if (prototype){
const grandPrototype = wrappedObject.getPrototypeOf(prototype); const grandPrototype = wrappedObject.getPrototypeOf(prototype);
if (proxies.has(grandPrototype)){ if (proxies.has(grandPrototype)){
const testPrototype = wrappedObject.create(proxies.get(grandPrototype).wrappedOriginal); const testPrototype = wrappedObject.create(proxies.get(grandPrototype).wrappedOriginal);
wrappedObject.setPrototypeOf(target, testPrototype); wrappedObject.setPrototypeOf(target, testPrototype);
} }
}
return wrappedObject.setPrototypeOf(target, scope.getWrapped(prototype)); return wrappedObject.setPrototypeOf(target, scope.getWrapped(prototype));
}, window, ""); }, window, "");
const proxy = new window.Proxy(original, handler); const proxy = new window.Proxy(original, handler);

4
versions/updates.json
View File

@ -333,6 +333,10 @@
{ {
"version": "1.10.20240408", "version": "1.10.20240408",
"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.10.20240408.xpi" "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.10.20240408.xpi"
},
{
"version": "1.11.20240417",
"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.11.20240417.xpi"
} }
] ]
} }