Merge branch 'enet_wip_nothing_to_see_here' of https://github.com/DigitalPulseSoftware/NazaraEngine into enet_wip_nothing_to_see_here

2017-02-16 23:26:33 +01:00
parent e0dca1b043 7b49b3dd0e
commit 20dfd61ad7
2 changed files with 6 additions and 3 deletions
--- a/include/Nazara/Network/NetPacket.inl
+++ b/include/Nazara/Network/NetPacket.inl
@@ -155,7 +155,9 @@ namespace Nz
 	{
 		InitStream(HeaderSize + size, HeaderSize, OpenMode_ReadOnly);
 		m_buffer->Resize(HeaderSize + size);
-		std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size);
+
+		if (ptr)
+			std::memcpy(m_buffer->GetBuffer() + HeaderSize, ptr, size);

 		m_netCode = netCode;
 	}