From c647b61904393adf88f4bfd78e8d8577d3897b9a Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 6 Nov 2013 23:56:20 +0100 Subject: [PATCH] Fixed MemoryStream::Read crash when just skipping (null buffer) Former-commit-id: 46072c0ebd093bcfa1e7f54d11deb034cbc55dae --- src/Nazara/Core/MemoryStream.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Core/MemoryStream.cpp b/src/Nazara/Core/MemoryStream.cpp index 60234c9de..30feaf13c 100644 --- a/src/Nazara/Core/MemoryStream.cpp +++ b/src/Nazara/Core/MemoryStream.cpp @@ -36,7 +36,10 @@ nzUInt64 NzMemoryStream::GetSize() const std::size_t NzMemoryStream::Read(void* buffer, std::size_t size) { unsigned int readSize = std::min(static_cast(size), static_cast(m_size-m_pos)); - std::memcpy(buffer, &m_ptr[m_pos], readSize); + + if (buffer) + std::memcpy(buffer, &m_ptr[m_pos], readSize); + m_pos += readSize; return readSize;