izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash if the app terminates before the control stream is connected

Browse Source
This commit is contained in:
Cameron Gutman
2023-05-04 21:08:14 -05:00
parent 5779a4bd89
commit df1286ac88
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stream.cpp
+7 -4
View File
@@ -897,11 +897,14 @@ namespace stream {
for (auto pos = std::begin(*server->_map_addr_session); pos != std::end(*server->_map_addr_session); ++pos) { for (auto pos = std::begin(*server->_map_addr_session); pos != std::end(*server->_map_addr_session); ++pos) {
auto session = pos->second.second; auto session = pos->second.second;
auto payload = encode_control(session, util::view(plaintext), encrypted_payload); // We may not have gotten far enough to have an ENet connection yet
if (session->control.peer) {
auto payload = encode_control(session, util::view(plaintext), encrypted_payload);
if (server->send(payload, session->control.peer)) { if (server->send(payload, session->control.peer)) {
TUPLE_2D(port, addr, platf::from_sockaddr_ex((sockaddr *) &session->control.peer->address.address)); TUPLE_2D(port, addr, platf::from_sockaddr_ex((sockaddr *) &session->control.peer->address.address));
BOOST_LOG(warning) << "Couldn't send termination code to ["sv << addr << ':' << port << ']'; BOOST_LOG(warning) << "Couldn't send termination code to ["sv << addr << ':' << port << ']';
}
} }
session->shutdown_event->raise(true); session->shutdown_event->raise(true);