BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Use a Buffer instead of SharedBuffer in ConnectionCommand

Browse Source 
This fixes #6373
This commit is contained in:
Loic Blot 2017-09-05 22:14:56 +02:00
parent f231112cc4
commit a3c298e1d1
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/connection.h
View File

@ -325,7 +325,7 @@ struct ConnectionCommand
Address address; Address address;
u16 peer_id = PEER_ID_INEXISTENT; u16 peer_id = PEER_ID_INEXISTENT;
u8 channelnum = 0; u8 channelnum = 0;
SharedBuffer<u8> data; Buffer<u8> data;
bool reliable = false; bool reliable = false;
bool raw = false; bool raw = false;

12
src/util/pointer.h
View File

@ -168,6 +168,18 @@ public:
/* /*
Copies whole buffer Copies whole buffer
*/ */
SharedBuffer(const Buffer<T> &buffer)
{
m_size = buffer.getSize();
if (m_size != 0) {
data = new T[m_size];
memcpy(data, *buffer, buffer.getSize());
}
else
data = NULL;
refcount = new unsigned int;
(*refcount) = 1;
}
~SharedBuffer() ~SharedBuffer()
{ {
drop(); drop();