thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65051 from ClickHouse/fix_capture_this_in_context_access

Browse Source 
Capture weak_ptr of ContextAccess for safety
This commit is contained in:
Alexander Gololobov 2024-06-13 13:37:36 +00:00 committed by GitHub
commit cb84733143
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Access/ContextAccess.cpp
View File

@ -360,10 +360,13 @@ void ContextAccess::setUser(const UserPtr & user_) const
subscription_for_roles_changes.reset(); subscription_for_roles_changes.reset();
enabled_roles = access_control->getEnabledRoles(current_roles, current_roles_with_admin_option); enabled_roles = access_control->getEnabledRoles(current_roles, current_roles_with_admin_option);
subscription_for_roles_changes = enabled_roles->subscribeForChanges([this](const std::shared_ptr<const EnabledRolesInfo> & roles_info_) subscription_for_roles_changes = enabled_roles->subscribeForChanges([weak_ptr = weak_from_this()](const std::shared_ptr<const EnabledRolesInfo> & roles_info_)
{ {
std::lock_guard lock{mutex}; auto ptr = weak_ptr.lock();
setRolesInfo(roles_info_); if (!ptr)
return;
std::lock_guard lock{ptr->mutex};
ptr->setRolesInfo(roles_info_);
}); });
setRolesInfo(enabled_roles->getRolesInfo()); setRolesInfo(enabled_roles->getRolesInfo());