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

fix: consume the file permission callback when used (#45267)

Browse source 
fixes 0e5fe3f regression
This commit is contained in:
Charles Kerr 2025-01-21 11:59:38 -06:00 • committed by GitHub
parent 9d32b6ddfc
commit e1762e6e44
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/file_system_access/file_system_access_permission_context.cc
View file

@ -594,7 +594,7 @@ void FileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess(
content::GlobalRenderFrameHostId frame_id, content::GlobalRenderFrameHostId frame_id,
base::OnceCallback<void(SensitiveEntryResult)> callback) { base::OnceCallback<void(SensitiveEntryResult)> callback) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
callback_map_[path_info.path] = std::move(callback); callback_map_.try_emplace(path_info.path, std::move(callback));
auto after_blocklist_check_callback = base::BindOnce( auto after_blocklist_check_callback = base::BindOnce(
&FileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist, &FileSystemAccessPermissionContext::DidCheckPathAgainstBlocklist,
@ -640,8 +640,8 @@ void FileSystemAccessPermissionContext::PerformAfterWriteChecks(
void FileSystemAccessPermissionContext::RunRestrictedPathCallback( void FileSystemAccessPermissionContext::RunRestrictedPathCallback(
const base::FilePath& file_path, const base::FilePath& file_path,
SensitiveEntryResult result) { SensitiveEntryResult result) {
if (base::Contains(callback_map_, file_path)) if (auto val = callback_map_.extract(file_path))
std::move(callback_map_[file_path]).Run(result); std::move(val.mapped()).Run(result);
} }
void FileSystemAccessPermissionContext::OnRestrictedPathResult( void FileSystemAccessPermissionContext::OnRestrictedPathResult(