TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 07:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

internal.

Browse Source 
PiperOrigin-RevId: 661059307
This commit is contained in:
Francis Tsui
2024-08-08 18:25:39 -07:00
committed by Copybara-Service
parent 39d7f796d2
commit 5bc52f3ab1
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/nearby_sharing_service_impl.cc
+21 -9
View File
@@ -336,7 +336,13 @@ void NearbySharingServiceImpl::Cleanup() {
for (auto& it : incoming_share_session_map_) {
it.second.OnDisconnect();
}
incoming_share_session_map_.clear();
// Clear out the incoming_share_session_map_ before destroying the sessions.
// Session destruction can trigger callbacks that access the map. That is not
// allowed while the map is being modified.
absl::flat_hash_map<int64_t, IncomingShareSession> tmp_incoming_session_map;
tmp_incoming_session_map.swap(incoming_share_session_map_);
tmp_incoming_session_map.clear();
discovered_advertisements_to_retry_map_.clear();
discovered_advertisements_retried_set_.clear();
@@ -2398,14 +2404,20 @@ void NearbySharingServiceImpl::RemoveOutgoingShareTargetWithEndpointId(
ShareTarget share_target = std::move(it->second);
outgoing_share_target_map_.erase(it);
auto session_it = outgoing_share_session_map_.find(share_target.id);
if (session_it != outgoing_share_session_map_.end()) {
session_it->second.OnDisconnect();
outgoing_share_session_map_.erase(session_it);
} else {
NL_LOG(WARNING) << __func__ << ": share_target.id=" << it->second.id
<< " not found in outgoing share session map.";
return;
{
// Do not destroy the session until it has been removed from the map.
// Session destruction can trigger callbacks that traverses the map and it
// cannot access the map while it is being modified.
absl::flat_hash_map<int64_t, OutgoingShareSession>::node_type session_node;
auto session_it = outgoing_share_session_map_.find(share_target.id);
if (session_it != outgoing_share_session_map_.end()) {
session_node = outgoing_share_session_map_.extract(session_it);
session_node.mapped().OnDisconnect();
} else {
NL_LOG(WARNING) << __func__ << ": share_target.id=" << it->second.id
<< " not found in outgoing share session map.";
return;
}
}
for (auto& entry : foreground_send_surface_map_) {