From 57b37c3d2c0d8cdf2e947ab02229c34f377b019b Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 28 Dec 2019 15:06:31 +0100 Subject: [PATCH] Minor fixes --- include/Nazara/Core/String.inl | 2 +- src/Nazara/Network/ENetHost.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Core/String.inl b/include/Nazara/Core/String.inl index 57c781f9e..eed2269d0 100644 --- a/include/Nazara/Core/String.inl +++ b/include/Nazara/Core/String.inl @@ -41,7 +41,7 @@ namespace Nz inline void String::ReleaseString() { - m_sharedString = std::move(GetEmptyString()); + m_sharedString = GetEmptyString(); } /*! diff --git a/src/Nazara/Network/ENetHost.cpp b/src/Nazara/Network/ENetHost.cpp index c5c599b5b..9b4e70fec 100644 --- a/src/Nazara/Network/ENetHost.cpp +++ b/src/Nazara/Network/ENetHost.cpp @@ -886,6 +886,7 @@ namespace Nz canPing = false; + assert(outgoingCommand->command.header.command < ENetProtocolCommand_Count); std::size_t commandSize = s_commandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask]; if (m_commandCount >= m_commands.size() || m_bufferCount + 1 >= m_buffers.size() || peer->GetMtu() - m_packetSize < commandSize || (outgoingCommand->packet && UInt16(peer->GetMtu() - m_packetSize) < UInt16(commandSize + outgoingCommand->fragmentLength))) @@ -1138,6 +1139,7 @@ namespace Nz { auto outgoingCommand = currentCommand; + assert(outgoingCommand->command.header.command < ENetProtocolCommand_Count); std::size_t commandSize = s_commandSizes[outgoingCommand->command.header.command & ENetProtocolCommand_Mask]; if (m_commandCount >= m_commands.size() || m_bufferCount + 1 >= m_buffers.size() || peer->m_mtu - m_packetSize < commandSize || @@ -1351,6 +1353,7 @@ namespace Nz std::size_t ENetHost::GetCommandSize(UInt8 commandNumber) { + assert(commandNumber < ENetProtocolCommand_Count); return s_commandSizes[commandNumber & ENetProtocolCommand_Mask]; }