From 837f0b52a39d531f5a938579ff38956f641926a2 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 3 Jan 2013 22:03:46 +0100 Subject: [PATCH] Fixed BufferMapper crash when buffer is nullptr Former-commit-id: 4f77a158cf93a4d7acbce50ac0454c38ea6cf412 --- include/Nazara/Utility/BufferMapper.inl | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/include/Nazara/Utility/BufferMapper.inl b/include/Nazara/Utility/BufferMapper.inl index 5b0b0d77f..437a42e58 100644 --- a/include/Nazara/Utility/BufferMapper.inl +++ b/include/Nazara/Utility/BufferMapper.inl @@ -12,9 +12,14 @@ template NzBufferMapper::NzBufferMapper(T* buffer, nzBufferAccess access, unsigned int offset, unsigned int length) : m_buffer(buffer) { - m_ptr = buffer->Map(access, offset, length); - if (!m_ptr) - NazaraError("Failed to map buffer"); ///TODO: Unexpected + if (m_buffer) + { + m_ptr = buffer->Map(access, offset, length); + if (!m_ptr) + NazaraError("Failed to map buffer"); ///TODO: Unexpected + } + else + m_ptr = nullptr; } template @@ -27,9 +32,14 @@ template NzBufferMapper::NzBufferMapper(const T* buffer, nzBufferAccess access, unsigned int offset, unsigned int length) : m_buffer(buffer) { - m_ptr = buffer->Map(access, offset, length); - if (!m_ptr) - NazaraError("Failed to map buffer"); ///TODO: Unexpected + if (m_buffer) + { + m_ptr = buffer->Map(access, offset, length); + if (!m_ptr) + NazaraError("Failed to map buffer"); ///TODO: Unexpected + } + else + m_ptr = nullptr; } template