github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 15:13:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: addChildView() crashes when adding a closed WebContentsView (#47099)

Browse Source 
fix: addChildView() crashes when add a closed WebContentsView
This commit is contained in:
Sta Zhu
2025-06-03 16:53:25 +08:00
committed by GitHub
parent d1e64c37a2
commit 158176f0f3
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/browser/api/electron_api_view.cc
View File

@@ -216,6 +216,12 @@ void View::AddChildViewAt(gin::Handle<View> child,
if (!view_)
return;
if (!child->view()) {
gin_helper::ErrorThrower(isolate()).ThrowError(
"Can't add a destroyed child view to a parent view");
return;
}
// This will CHECK and crash in View::AddChildViewAtImpl if not handled here.
if (view_ == child->view()) {
gin_helper::ErrorThrower(isolate()).ThrowError(

14
spec/api-web-contents-view-spec.ts
View File

@@ -55,6 +55,20 @@ describe('WebContentsView', () => {
})).to.throw('options.webContents is already attached to a window');
});
it('should throw an error when adding a destroyed child view to the parent view', async () => {
const browserWindow = new BrowserWindow();
const webContentsView = new WebContentsView();
webContentsView.webContents.loadURL('about:blank');
webContentsView.webContents.destroy();
const destroyed = once(webContentsView.webContents, 'destroyed');
await destroyed;
expect(() => browserWindow.contentView.addChildView(webContentsView)).to.throw(
'Can\'t add a destroyed child view to a parent view'
);
});
it('should throw error when created with already attached webContents to other WebContentsView', () => {
const browserWindow = new BrowserWindow();