Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Fix a use-after-free in client close (#5844)

Browse Source
This commit is contained in:
Peter Johnson
2023-10-29 16:49:45 -07:00
committed by GitHub
parent ed168b522c
commit 35472f5fc9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ntcore/src/main/native/cpp/NetworkClient.cpp
View File

@@ -418,9 +418,13 @@ void NetworkClient::WsConnected(wpi::WebSocket& ws, uv::Tcp& tcp,
ws.closed.connect([this, &ws](uint16_t, std::string_view reason) {
if (!ws.GetStream().IsLoopClosing()) {
// we could be in the middle of sending data, so defer disconnect
// capture a shared_ptr copy of ws to make sure it doesn't get destroyed
// until after DoDisconnect returns
uv::Timer::SingleShot(
m_loop, uv::Timer::Time{0},
[this, reason = std::string{reason}] { DoDisconnect(reason); });
[this, reason = std::string{reason}, keepws = ws.shared_from_this()] {
DoDisconnect(reason);
});
}
});
ws.text.connect([this](std::string_view data, bool) {