0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

servers: avoid potential dangling queue items in send_doc_queued()

Browse source 
Use scope guards to ensure that queues are cleared of that socket whenever
coro_send_doc() throws.
This commit is contained in:
loonycyborg 2022-05-27 22:07:28 +03:00
parent 330c13b2da
commit adb2e0921d
No known key found for this signature in database
GPG key ID: 6E8233FAB8F26D61
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server/common/server_base.cpp
View file

@ -21,6 +21,7 @@
#include "serialization/parser.hpp"
#include "serialization/base64.hpp"
#include "filesystem.hpp"
#include "utils/scope_exit.hpp"
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -543,13 +544,12 @@ template<class SocketPtr> void server_base::send_doc_queued(SocketPtr socket, st
return;
}
ON_SCOPE_EXIT(this, socket) { queues.erase(socket); };
while(queues[socket].size() > 0) {
boost::system::error_code error;
coro_send_doc(socket, *(queues[socket].front()), yield[error]);
check_error(error, socket);
queues[socket].pop();
coro_send_doc(socket, *(queues[socket].front()), yield);
ON_SCOPE_EXIT(this, socket) { queues[socket].pop(); };
}
queues.erase(socket);
}
template<class SocketPtr> void server_base::async_send_doc_queued(SocketPtr socket, simple_wml::document& doc)