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

fix: crash on input file handler dialog (#19897)

Browse source 
* fix: crash on input file handler dialog

* invert cancellation logic
This commit is contained in:
Shelley Vohr 2019-08-23 14:18:30 -07:00 committed by GitHub
parent c61020e9d3
commit 698120daf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
shell/browser/web_dialog_helper.cc
View file

@ -128,7 +128,9 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
// listener is called from the directory enumerator. // listener is called from the directory enumerator.
bool ready_to_call_listener = false; bool ready_to_call_listener = false;
if (!canceled) { if (canceled) {
OnSelectionCancelled();
} else {
std::vector<base::FilePath> paths; std::vector<base::FilePath> paths;
if (result.Get("filePaths", &paths)) { if (result.Get("filePaths", &paths)) {
// If we are uploading a folder we need to enumerate its contents // If we are uploading a folder we need to enumerate its contents
@ -153,10 +155,10 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
paths[0].DirName()); paths[0].DirName());
} }
} }
// We should only call this if we have not cancelled the dialog
if (ready_to_call_listener)
OnFilesSelected(std::move(file_info), lister_base_dir_);
} }
if (ready_to_call_listener)
OnFilesSelected(std::move(file_info), lister_base_dir_);
} }
void OnSaveDialogDone(mate::Dictionary result) { void OnSaveDialogDone(mate::Dictionary result) {
@ -164,15 +166,18 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
bool canceled = true; bool canceled = true;
result.Get("canceled", &canceled); result.Get("canceled", &canceled);
if (!canceled) { if (canceled) {
OnSelectionCancelled();
} else {
base::FilePath path; base::FilePath path;
if (result.Get("filePath", &path)) { if (result.Get("filePath", &path)) {
file_info.push_back(FileChooserFileInfo::NewNativeFile( file_info.push_back(FileChooserFileInfo::NewNativeFile(
blink::mojom::NativeFileInfo::New( blink::mojom::NativeFileInfo::New(
path, path.BaseName().AsUTF16Unsafe()))); path, path.BaseName().AsUTF16Unsafe())));
} }
// We should only call this if we have not cancelled the dialog
OnFilesSelected(std::move(file_info), base::FilePath());
} }
OnFilesSelected(std::move(file_info), base::FilePath());
} }
void OnFilesSelected(std::vector<FileChooserFileInfoPtr> file_info, void OnFilesSelected(std::vector<FileChooserFileInfoPtr> file_info,
@ -184,6 +189,14 @@ class FileSelectHelper : public base::RefCounted<FileSelectHelper>,
render_frame_host_ = nullptr; render_frame_host_ = nullptr;
} }
void OnSelectionCancelled() {
if (listener_) {
listener_->FileSelectionCanceled();
listener_.reset();
}
render_frame_host_ = nullptr;
}
// content::WebContentsObserver: // content::WebContentsObserver:
void RenderFrameHostChanged(content::RenderFrameHost* old_host, void RenderFrameHostChanged(content::RenderFrameHost* old_host,
content::RenderFrameHost* new_host) override { content::RenderFrameHost* new_host) override {