Skip to content
Permalink
Browse files

Pass SharedBuffer as value to increment reference count

This should fix #6332
Refcount is not increased due to reference, it can make this refcount incorrect in a multithread context
  • Loading branch information...
nerzhul committed Aug 28, 2017
1 parent 04158d0 commit 6fd8a27c91b09f51693243586af3615f962d1730
Showing with 11 additions and 11 deletions.
  1. +5 −5 src/network/connectionthreads.cpp
  2. +6 −6 src/network/connectionthreads.h
@@ -1098,7 +1098,7 @@ bool ConnectionReceiveThread::checkIncomingBuffers(Channel *channel,
}

SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
SharedBuffer<u8> &packetdata, u16 peer_id, u8 channelnum, bool reliable)
SharedBuffer<u8> packetdata, u16 peer_id, u8 channelnum, bool reliable)
{
PeerHelper peer = m_connection->getPeerNoEx(peer_id);

@@ -1137,7 +1137,7 @@ const ConnectionReceiveThread::PacketTypeHandler
};

SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Control(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum, bool reliable)
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum, bool reliable)
{
if (packetdata.getSize() < 2)
throw InvalidIncomingDataException("packetdata.getSize() < 2");
@@ -1247,7 +1247,7 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Control(Channel *chan
}

SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Original(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum, bool reliable)
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum, bool reliable)
{
if (packetdata.getSize() <= ORIGINAL_HEADER_SIZE)
throw InvalidIncomingDataException
@@ -1261,7 +1261,7 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Original(Channel *cha
}

SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Split(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum, bool reliable)
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum, bool reliable)
{
Address peer_address;

@@ -1292,7 +1292,7 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Split(Channel *channe
}

SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Reliable(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum, bool reliable)
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum, bool reliable)
{
assert(channel != NULL);

@@ -118,26 +118,26 @@ class ConnectionReceiveThread : public Thread
channelnum: channel on which the packet was sent
reliable: true if recursing into a reliable packet
*/
SharedBuffer<u8> processPacket(Channel *channel, SharedBuffer<u8> &packetdata,
SharedBuffer<u8> processPacket(Channel *channel, SharedBuffer<u8> packetdata,
u16 peer_id, u8 channelnum, bool reliable);

SharedBuffer<u8> handlePacketType_Control(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum,
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum,
bool reliable);
SharedBuffer<u8> handlePacketType_Original(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum,
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum,
bool reliable);
SharedBuffer<u8> handlePacketType_Split(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum,
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum,
bool reliable);
SharedBuffer<u8> handlePacketType_Reliable(Channel *channel,
SharedBuffer<u8> &packetdata, Peer *peer, u8 channelnum,
SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum,
bool reliable);

struct PacketTypeHandler
{
SharedBuffer<u8> (ConnectionReceiveThread::*handler)(Channel *channel,
SharedBuffer<u8> &packet, Peer *peer, u8 channelnum,
SharedBuffer<u8> packet, Peer *peer, u8 channelnum,
bool reliable);
};

0 comments on commit 6fd8a27

Please sign in to comment.
You can’t perform that action at this time.