mirror of https://github.com/OpenTTD/OpenTTD
(svn r21182) -Fix: possible just-freed memory reads
parent
a9da53c106
commit
673b3711b4
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue