Skip to content
Permalink
Browse files
(svn r21182) -Fix: possible just-freed memory reads
  • Loading branch information
rubidium42 committed Nov 14, 2010
1 parent a9da53c commit 673b3711b44f019fb5869546b4a3dc2b78882c2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
@@ -82,6 +82,8 @@ void NetworkTCPSocketHandler::Send_Packet(Packet *packet)
* data right now (full network-buffer, it happens ;))
* 3) sending took too long
* @param closing_down Whether we are closing down the connection.
* @return \c true if a (part of a) packet could be sent and
* the connection is not closed yet.
*/
bool NetworkTCPSocketHandler::Send_Packets(bool closing_down)
{
@@ -138,9 +138,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta
NetworkClientSocket *cs;
FOR_ALL_CLIENT_SOCKETS(cs) {
if (cs->writable) {
cs->Send_Packets();

if (cs->status == STATUS_MAP) {
if (cs->Send_Packets() && cs->status == STATUS_MAP) {
/* This client is in the middle of a map-send, call the function for that */
cs->SendMap();
}
@@ -451,8 +449,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap()
}

/* Send all packets (forced) and check if we have send it all */
this->Send_Packets();
if (this->IsPacketQueueEmpty()) {
if (this->Send_Packets() && this->IsPacketQueueEmpty()) {
/* All are sent, increase the sent_packets */
sent_packets *= 2;
} else {

0 comments on commit 673b371

Please sign in to comment.