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

Fix dereferencing of null channel

Browse Source 
PiperOrigin-RevId: 401814449
This commit is contained in:
nohle
2021-10-08 11:19:12 -07:00
committed by Copybara-Service
parent 686351c4c3
commit 51a19d24c1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/base_pcp_handler.cc
+4 -2
View File
@@ -518,11 +518,13 @@ Status BasePcpHandler::RequestConnection(ClientProxy* client,
}
}
Medium channel_medium =
channel ? channel->GetMedium() : Medium::UNKNOWN_MEDIUM;
if (channel == nullptr) {
NEARBY_LOGS(INFO)
<< "Endpoint channel not available: endpoint_id=" << endpoint_id;
ProcessPreConnectionInitiationFailure(
client, channel->GetMedium(), endpoint_id, channel.get(),
client, channel_medium, endpoint_id, channel.get(),
/* is_incoming = */ false, start_time, connect_impl_result.status,
result.get());
return;
@@ -546,7 +548,7 @@ Status BasePcpHandler::RequestConnection(ClientProxy* client,
NEARBY_LOGS(INFO) << "Failed to send connection request: endpoint_id="
<< endpoint_id;
ProcessPreConnectionInitiationFailure(
client, channel->GetMedium(), endpoint_id, channel.get(),
client, channel_medium, endpoint_id, channel.get(),
/* is_incoming = */ false, start_time, {Status::kEndpointIoError},
result.get());
return;
cpp/core/internal/bwu_manager.cc
+4 -2
View File
@@ -171,9 +171,11 @@ void BwuManager::InitiateBwuForEndpoint(ClientProxy* client,
CancelRetryUpgradeAlarm(endpoint_id);
auto channel = channel_manager_->GetChannelForEndpoint(endpoint_id);
Medium channel_medium =
channel ? channel->GetMedium() : Medium::UNKNOWN_MEDIUM;
client->GetAnalyticsRecorder().OnBandwidthUpgradeStarted(
endpoint_id, channel->GetMedium(), medium_,
proto::connections::INCOMING, client->GetConnectionToken(endpoint_id));
endpoint_id, channel_medium, medium_, proto::connections::INCOMING,
client->GetConnectionToken(endpoint_id));
if (channel == nullptr) {
NEARBY_LOGS(INFO)
<< "BwuManager couldn't complete the upgrade for endpoint "