mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: handle _sendToFrameInternal() throwing an exception in remote/server.ts (#27046)

Browse source
This commit is contained in:
Milan Burda 2020-12-17 23:28:40 +01:00 • committed by GitHub
parent da3d21e5e3
commit a55e028b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/browser/remote/server.ts
View file

@ -31,7 +31,13 @@ const finalizationRegistry = new FinalizationRegistry((fi: FinalizerInfo) => {
const ref = rendererFunctionCache.get(mapKey); const ref = rendererFunctionCache.get(mapKey);
if (ref !== undefined && ref.deref() === undefined) { if (ref !== undefined && ref.deref() === undefined) {
rendererFunctionCache.delete(mapKey); rendererFunctionCache.delete(mapKey);
if (!fi.webContents.isDestroyed()) { fi.webContents._sendToFrameInternal(fi.frameId, IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, fi.id[0], fi.id[1]); } if (!fi.webContents.isDestroyed()) {
try {
fi.webContents._sendToFrameInternal(fi.frameId, IPC_MESSAGES.RENDERER_RELEASE_CALLBACK, fi.id[0], fi.id[1]);
} catch (error) {
console.warn(`_sendToFrameInternal() failed: ${error}`);
}
}
} }
}); });
@ -265,7 +271,11 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: [number, num
const callIntoRenderer = function (this: any, ...args: any[]) { const callIntoRenderer = function (this: any, ...args: any[]) {
let succeed = false; let succeed = false;
if (!sender.isDestroyed()) { if (!sender.isDestroyed()) {
succeed = sender._sendToFrameInternal(frameId, IPC_MESSAGES.RENDERER_CALLBACK, contextId, meta.id, valueToMeta(sender, contextId, args)); try {
succeed = sender._sendToFrameInternal(frameId, IPC_MESSAGES.RENDERER_CALLBACK, contextId, meta.id, valueToMeta(sender, contextId, args));
} catch (error) {
console.warn(`_sendToFrameInternal() failed: ${error}`);
}
} }
if (!succeed) { if (!succeed) {
removeRemoteListenersAndLogWarning(this, callIntoRenderer); removeRemoteListenersAndLogWarning(this, callIntoRenderer);