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

chore: call ListenerDestroyed() in FileSelectHelper::RunFileChooserEnd() (#37006)

Browse source 
chore: call ListenerDestroyed() in FileSelectHelper::RunFileChooserEnd()
This commit is contained in:
Shelley Vohr 2023-01-25 15:51:01 +01:00 • committed by GitHub
commit afca3ff965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/file_select_helper.cc
View file

@ -180,7 +180,7 @@ void FileSelectHelper::OnListDone(int error) {
std::unique_ptr<ActiveDirectoryEnumeration> entry = std::unique_ptr<ActiveDirectoryEnumeration> entry =
std::move(directory_enumeration_); std::move(directory_enumeration_);
if (error) { if (error) {
FileSelectionCanceled(NULL); FileSelectionCanceled(nullptr);
return; return;
} }
@ -487,6 +487,11 @@ void FileSelectHelper::RunFileChooserEnd() {
listener_->FileSelectionCanceled(); listener_->FileSelectionCanceled();
render_frame_host_ = nullptr; render_frame_host_ = nullptr;
web_contents_ = nullptr; web_contents_ = nullptr;
// If the dialog was actually opened, dispose of our reference.
if (select_file_dialog_) {
select_file_dialog_->ListenerDestroyed();
select_file_dialog_.reset();
}
Release(); Release();
} }
@ -525,8 +530,6 @@ void FileSelectHelper::RenderWidgetHostDestroyed(
void FileSelectHelper::RenderFrameHostChanged( void FileSelectHelper::RenderFrameHostChanged(
content::RenderFrameHost* old_host, content::RenderFrameHost* old_host,
content::RenderFrameHost* new_host) { content::RenderFrameHost* new_host) {
if (!render_frame_host_)
return;
// The |old_host| and its children are now pending deletion. Do not give them // The |old_host| and its children are now pending deletion. Do not give them
// file access past this point. // file access past this point.
for (content::RenderFrameHost* host = render_frame_host_; host; for (content::RenderFrameHost* host = render_frame_host_; host;