Use a Buffer instead of SharedBuffer in ConnectionCommand

This fixes #6373
minetest · Sep 5, 2017 · a3c298e · a3c298e
1 parent f231112
commit a3c298e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/network/connection.h b/src/network/connection.h
@@ -325,7 +325,7 @@ struct ConnectionCommand
 	Address address;
 	u16 peer_id = PEER_ID_INEXISTENT;
 	u8 channelnum = 0;
-	SharedBuffer<u8> data;
+	Buffer<u8> data;
 	bool reliable = false;
 	bool raw = false;
 

diff --git a/src/util/pointer.h b/src/util/pointer.h
@@ -168,6 +168,18 @@ class SharedBuffer
 	/*
 		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()
 	{
 		drop();