From 6fd19f05f1eba884a20e79ee43fce1af388204d4 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 14 Feb 2018 00:14:17 -0500 Subject: hle_ipc: Add GetReadBufferSize and check write buffer size. --- src/core/hle/kernel/hle_ipc.cpp | 7 +++++++ src/core/hle/kernel/hle_ipc.h | 3 +++ 2 files changed, 10 insertions(+) (limited to 'src/core/hle/kernel') diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 0a9986c18..d592f502d 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -229,6 +229,8 @@ std::vector HLERequestContext::ReadBuffer() const { size_t HLERequestContext::WriteBuffer(const void* buffer, const size_t size) const { const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()}; + ASSERT_MSG(size <= GetWriteBufferSize(), "Size %d is too big", size); + if (is_buffer_b) { Memory::WriteBlock(BufferDescriptorB()[0].Address(), buffer, size); } else { @@ -242,6 +244,11 @@ size_t HLERequestContext::WriteBuffer(const std::vector& buffer) const { return WriteBuffer(buffer.data(), buffer.size()); } +size_t HLERequestContext::GetReadBufferSize() const { + const bool is_buffer_a{BufferDescriptorA().size() && BufferDescriptorA()[0].Size()}; + return is_buffer_a ? BufferDescriptorA()[0].Size() : BufferDescriptorX()[0].Size(); +} + size_t HLERequestContext::GetWriteBufferSize() const { const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()}; return is_buffer_b ? BufferDescriptorB()[0].Size() : BufferDescriptorC()[0].Size(); diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 0cc270909..5b1eae74a 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -152,6 +152,9 @@ public: /// Helper function to write a buffer using the appropriate buffer descriptor size_t WriteBuffer(const std::vector& buffer) const; + /// Helper function to get the size of the input buffer + size_t GetReadBufferSize() const; + /// Helper function to get the size of the output buffer size_t GetWriteBufferSize() const; -- cgit v1.2.3