sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/Packet: Fixes buffer size

Browse Source 
Former-commit-id: 51fd56f76af8abe8feb1ed88802ef7ec0bd4a175
This commit is contained in:
Lynix
2016-02-24 14:17:28 +01:00
parent d6279914b4
commit a851056c0a
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Nazara/Network/NetPacket.cpp
View File

@@ -66,9 +66,9 @@ namespace Nz
s_availableBuffers.emplace_back(std::make_pair(size, std::move(m_buffer)));
}
void NetPacket::InitStream(std::size_t minSize, UInt64 cursorPos, UInt32 openMode)
void NetPacket::InitStream(std::size_t minCapacity, UInt64 cursorPos, UInt32 openMode)
{
NazaraAssert(minSize >= cursorPos, "Cannot init stream with a smaller size than wanted cursor pos");
NazaraAssert(minCapacity >= cursorPos, "Cannot init stream with a smaller capacity than wanted cursor pos");
{
Nz::LockGuard lock(*s_availableBuffersMutex);
@@ -85,8 +85,7 @@ namespace Nz
if (!m_buffer)
m_buffer = std::make_unique<ByteArray>();
if (m_buffer->GetSize() < minSize)
m_buffer->Resize(minSize);
m_buffer->Resize(static_cast<std::size_t>(cursorPos));
m_memoryStream.SetBuffer(m_buffer.get(), openMode);
m_memoryStream.SetCursorPos(cursorPos);