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

Fixed a segfault with dangling listeners

Browse Source
This commit is contained in:
kidfromjupiter
2026-01-17 08:15:17 +00:00
parent a61607360c
commit a8f706c801
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/core.cc
+14 -11
View File
@@ -15,6 +15,7 @@
#include "connections/core.h"
#include <cstdint>
#include <memory>
#include <string>
#include <utility>
#include <vector>
@@ -215,13 +216,15 @@ void Core::StartAdvertisingV3(absl::string_view service_id,
const NearbyDevice& local_device,
v3::ConnectionListener listener,
ResultCallback callback) {
auto listener_ptr =
std::make_shared<v3::ConnectionListener>(std::move(listener));
ConnectionListener old_listener = {
.initiated_cb =
[&listener](const std::string& endpoint_id,
const ConnectionResponseInfo& info) {
[listener_ptr](const std::string& endpoint_id,
const ConnectionResponseInfo& info) {
auto remote_device = v3::ConnectionsDevice(
endpoint_id, info.remote_endpoint_info.AsStringView(), {});
listener.initiated_cb(
listener_ptr->initiated_cb(
remote_device,
v3::InitialConnectionInfo{
.authentication_digits = info.authentication_token,
@@ -231,7 +234,7 @@ void Core::StartAdvertisingV3(absl::string_view service_id,
});
},
.accepted_cb =
[v3_cb = listener.result_cb](const std::string& endpoint_id) {
[v3_cb = listener_ptr->result_cb](const std::string& endpoint_id) {
auto remote_device = v3::ConnectionsDevice(endpoint_id, "", {});
v3_cb(remote_device,
v3::ConnectionResult{.status = Status{
@@ -239,23 +242,23 @@ void Core::StartAdvertisingV3(absl::string_view service_id,
}});
},
.rejected_cb =
[v3_cb = listener.result_cb](const std::string& endpoint_id,
Status status) {
[v3_cb = listener_ptr->result_cb](const std::string& endpoint_id,
Status status) {
auto remote_device = v3::ConnectionsDevice(endpoint_id, "", {});
v3_cb(remote_device, v3::ConnectionResult{
.status = status,
});
},
.disconnected_cb =
[&listener](const std::string& endpoint_id) {
[listener_ptr](const std::string& endpoint_id) {
auto remote_device = v3::ConnectionsDevice(endpoint_id, "", {});
listener.disconnected_cb(remote_device);
listener_ptr->disconnected_cb(remote_device);
},
.bandwidth_changed_cb =
[&listener](const std::string& endpoint_id, Medium medium) {
[listener_ptr](const std::string& endpoint_id, Medium medium) {
auto remote_device = v3::ConnectionsDevice(endpoint_id, "", {});
listener.bandwidth_changed_cb(remote_device,
v3::BandwidthInfo{.medium = medium});
listener_ptr->bandwidth_changed_cb(
remote_device, v3::BandwidthInfo{.medium = medium});
}};
ByteArray local_endpoint_info;
if (local_device.GetType() == NearbyDevice::kConnectionsDevice) {