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

[NC] Fix nullptr crashes in BasePcpHandler

Browse Source 
PiperOrigin-RevId: 453967262
This commit is contained in:
crisrael
2022-06-09 11:10:49 -07:00
committed by Copybara-Service
parent 1aeb1093a9
commit 89462d1d45
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/base_pcp_handler.cc
+15 -15
View File
@@ -1417,28 +1417,20 @@ void BasePcpHandler::EvaluateConnectionResult(ClientProxy* client,
CHECK(context); // there is no way how this can fail, if Verify succeeded.
// If it did, it's a UKEY2 protocol bug.
channel_manager_->EncryptChannelForEndpoint(endpoint_id,
std::move(context));
client->GetAnalyticsRecorder().OnConnectionEstablished(
endpoint_id,
channel_manager_->GetChannelForEndpoint(endpoint_id)->GetMedium(),
connection_info.connection_token);
if (!channel_manager_->EncryptChannelForEndpoint(endpoint_id,
std::move(context))) {
response_code = {Status::kEndpointUnknown};
}
} else {
NEARBY_LOGS(INFO) << "Pending connection rejected; endpoint_id="
<< endpoint_id;
response_code = {Status::kConnectionRejected};
}
// Invoke the client callback to let it know of the connection result.
if (response_code.Ok()) {
client->OnConnectionAccepted(endpoint_id);
} else {
client->OnConnectionRejected(endpoint_id, response_code);
}
// If the connection failed, clean everything up and short circuit.
if (!is_connection_accepted) {
if (!response_code.Ok()) {
client->OnConnectionRejected(endpoint_id, response_code);
// Clean up the channel in EndpointManager if it's no longer required.
if (can_close_immediately) {
endpoint_manager_->DiscardEndpoint(client, endpoint_id);
@@ -1456,6 +1448,14 @@ void BasePcpHandler::EvaluateConnectionResult(ClientProxy* client,
return;
}
client->GetAnalyticsRecorder().OnConnectionEstablished(
endpoint_id,
channel_manager_->GetChannelForEndpoint(endpoint_id)->GetMedium(),
connection_info.connection_token);
// Invoke the client callback to let it know of the connection result.
client->OnConnectionAccepted(endpoint_id);
// Kick off the bandwidth upgrade for incoming connections.
if (connection_info.is_incoming &&
AutoUpgradeBandwidth(client->GetAdvertisingOptions())) {