ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crashed caused by sending messages that have been read previously

Browse Source 
(which were sent with incorrect length).
This commit is contained in:
hiker 2016-03-09 21:21:50 +11:00
parent 45b2fef88a
commit 6d1e5dc8ae
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network_string.hpp
View File

@ -152,6 +152,12 @@ public:
/** Returns the remaining length of the network string. */ /** Returns the remaining length of the network string. */
unsigned int size() const { return (int)m_buffer.size()-m_current_offset; } unsigned int size() const { return (int)m_buffer.size()-m_current_offset; }
// ------------------------------------------------------------------------
/** Returns the send size, which is the full length of the buffer. A
* difference to size() happens if the string to be sent was previously
* read, and has m_current_offset != 0. Even in this case the whole
* string must be sent. */
unsigned int getTotalSize() const { return m_buffer.size(); }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// All functions related to adding data to a network string // All functions related to adding data to a network string
/** Add 8 bit unsigned int. */ /** Add 8 bit unsigned int. */

3
src/network/stk_peer.cpp
View File

@ -69,7 +69,8 @@ void STKPeer::sendPacket(NetworkString *data, bool reliable)
Log::verbose("STKPeer", "sending packet of size %d to %s", Log::verbose("STKPeer", "sending packet of size %d to %s",
data->size(), a.toString().c_str()); data->size(), a.toString().c_str());
ENetPacket* packet = enet_packet_create(data->getData(), data->size(), ENetPacket* packet = enet_packet_create(data->getData(),
data->getTotalSize(),
(reliable ? ENET_PACKET_FLAG_RELIABLE (reliable ? ENET_PACKET_FLAG_RELIABLE
: ENET_PACKET_FLAG_UNSEQUENCED)); : ENET_PACKET_FLAG_UNSEQUENCED));
enet_peer_send(m_enet_peer, 0, packet); enet_peer_send(m_enet_peer, 0, packet);