Skip to content

views: fix crashes due dangling pointers #4072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

views: fix crashes due dangling pointers #4072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
278115b
views: callback for clearing native_delegate_
metux Oct 31, 2025
c285539
views: ChildWindowDelegate: clear native_delegate_ on destruct
metux Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions include/views/cef_view_delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@ class CefViewDelegate : public virtual CefBaseRefCounted {
///
/*--cef()--*/
virtual void OnThemeChanged(CefRefPtr<CefView> view) {}

#if CEF_API_ADDED(CEF_NEXT)
///
/// Called by CefBrowserPlatformDelegateChromeViews::BrowserDestroyed()
///
/// We have to drop our reference to the native delegate, because it's
/// going to be destroyed very soon.
///
/*--cef(added=next)--*/
virtual void ClearNativeDelegate() {}
#endif
};

#endif // CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_
6 changes: 6 additions & 0 deletions libcef/browser/chrome/views/browser_platform_delegate_chrome_views.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ void CefBrowserPlatformDelegateChromeViews::BrowserDestroyed(
CefBrowserPlatformDelegateChrome::BrowserDestroyed(browser);
// |browser_view_| may be destroyed before this callback arrives.
if (browser_view_) {
CefRefPtr<CefWindow> window = browser_view_->GetWindow();
if (window) {
CefRefPtr<CefViewDelegate> delegate = window->GetDelegate();
if (delegate)
delegate->ClearNativeDelegate();
}
browser_view_->BrowserDestroyed(browser);
}
browser_view_ = nullptr;
Expand Down
6 changes: 5 additions & 1 deletion libcef/browser/chrome/views/chrome_child_window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ class ChildWindowDelegate : public CefWindowDelegate {
void OnWindowDestroyed(CefRefPtr<CefWindow> window) override {
browser_view_ = nullptr;
window_ = nullptr;
#if BUILDFLAG(IS_WIN)
native_delegate_ = nullptr;
}

void ClearNativeDelegate() override {
#if defined(USE_AURA)
native_delegate_ = nullptr;
#endif
}
Expand Down