flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

hle_ipc: Add GetReadBufferSize and check write buffer size.

Browse source
This commit is contained in:
bunnei 2018-02-14 00:14:17 -05:00
parent 516a95721c
commit 6fd19f05f1
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/kernel/hle_ipc.cpp
View file

@ -229,6 +229,8 @@ std::vector<u8> HLERequestContext::ReadBuffer() const {
size_t HLERequestContext::WriteBuffer(const void* buffer, const size_t size) const { size_t HLERequestContext::WriteBuffer(const void* buffer, const size_t size) const {
const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()}; const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()};
ASSERT_MSG(size <= GetWriteBufferSize(), "Size %d is too big", size);
if (is_buffer_b) { if (is_buffer_b) {
Memory::WriteBlock(BufferDescriptorB()[0].Address(), buffer, size); Memory::WriteBlock(BufferDescriptorB()[0].Address(), buffer, size);
} else { } else {
@ -242,6 +244,11 @@ size_t HLERequestContext::WriteBuffer(const std::vector<u8>& buffer) const {
return WriteBuffer(buffer.data(), buffer.size()); 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 { size_t HLERequestContext::GetWriteBufferSize() const {
const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()}; const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()};
return is_buffer_b ? BufferDescriptorB()[0].Size() : BufferDescriptorC()[0].Size(); return is_buffer_b ? BufferDescriptorB()[0].Size() : BufferDescriptorC()[0].Size();

3
src/core/hle/kernel/hle_ipc.h
View file

@ -152,6 +152,9 @@ public:
/// Helper function to write a buffer using the appropriate buffer descriptor /// Helper function to write a buffer using the appropriate buffer descriptor
size_t WriteBuffer(const std::vector<u8>& buffer) const; size_t WriteBuffer(const std::vector<u8>& 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 /// Helper function to get the size of the output buffer
size_t GetWriteBufferSize() const; size_t GetWriteBufferSize() const;