Merge pull request #4152 from ogniK5377/ipc-err
Mark invalid IPC buffers as ASSERT_OR_EXECUTE_MSG
This commit is contained in:
commit
a91f92a89d
|
@ -282,17 +282,17 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(Thread& thread) {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const {
|
std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const {
|
||||||
std::vector<u8> buffer;
|
std::vector<u8> buffer{};
|
||||||
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
|
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
|
||||||
BufferDescriptorA()[buffer_index].Size()};
|
BufferDescriptorA()[buffer_index].Size()};
|
||||||
|
|
||||||
if (is_buffer_a) {
|
if (is_buffer_a) {
|
||||||
ASSERT_MSG(BufferDescriptorA().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorA().size() > buffer_index, { return buffer; },
|
||||||
"BufferDescriptorA invalid buffer_index {}", buffer_index);
|
"BufferDescriptorA invalid buffer_index {}", buffer_index);
|
||||||
buffer.resize(BufferDescriptorA()[buffer_index].Size());
|
buffer.resize(BufferDescriptorA()[buffer_index].Size());
|
||||||
memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), buffer.data(), buffer.size());
|
memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), buffer.data(), buffer.size());
|
||||||
} else {
|
} else {
|
||||||
ASSERT_MSG(BufferDescriptorX().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorX().size() > buffer_index, { return buffer; },
|
||||||
"BufferDescriptorX invalid buffer_index {}", buffer_index);
|
"BufferDescriptorX invalid buffer_index {}", buffer_index);
|
||||||
buffer.resize(BufferDescriptorX()[buffer_index].Size());
|
buffer.resize(BufferDescriptorX()[buffer_index].Size());
|
||||||
memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), buffer.data(), buffer.size());
|
memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), buffer.data(), buffer.size());
|
||||||
|
@ -318,16 +318,16 @@ std::size_t HLERequestContext::WriteBuffer(const void* buffer, std::size_t size,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_buffer_b) {
|
if (is_buffer_b) {
|
||||||
ASSERT_MSG(BufferDescriptorB().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorB().size() > buffer_index &&
|
||||||
"BufferDescriptorB invalid buffer_index {}", buffer_index);
|
BufferDescriptorB()[buffer_index].Size() >= size,
|
||||||
ASSERT_MSG(BufferDescriptorB()[buffer_index].Size() >= size,
|
{ return 0; }, "BufferDescriptorB is invalid, index={}, size={}",
|
||||||
"BufferDescriptorB buffer_index {} is not large enough", buffer_index);
|
buffer_index, size);
|
||||||
memory.WriteBlock(BufferDescriptorB()[buffer_index].Address(), buffer, size);
|
memory.WriteBlock(BufferDescriptorB()[buffer_index].Address(), buffer, size);
|
||||||
} else {
|
} else {
|
||||||
ASSERT_MSG(BufferDescriptorC().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorC().size() > buffer_index &&
|
||||||
"BufferDescriptorC invalid buffer_index {}", buffer_index);
|
BufferDescriptorC()[buffer_index].Size() >= size,
|
||||||
ASSERT_MSG(BufferDescriptorC()[buffer_index].Size() >= size,
|
{ return 0; }, "BufferDescriptorC is invalid, index={}, size={}",
|
||||||
"BufferDescriptorC buffer_index {} is not large enough", buffer_index);
|
buffer_index, size);
|
||||||
memory.WriteBlock(BufferDescriptorC()[buffer_index].Address(), buffer, size);
|
memory.WriteBlock(BufferDescriptorC()[buffer_index].Address(), buffer, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -338,16 +338,12 @@ std::size_t HLERequestContext::GetReadBufferSize(std::size_t buffer_index) const
|
||||||
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
|
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
|
||||||
BufferDescriptorA()[buffer_index].Size()};
|
BufferDescriptorA()[buffer_index].Size()};
|
||||||
if (is_buffer_a) {
|
if (is_buffer_a) {
|
||||||
ASSERT_MSG(BufferDescriptorA().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorA().size() > buffer_index, { return 0; },
|
||||||
"BufferDescriptorA invalid buffer_index {}", buffer_index);
|
"BufferDescriptorA invalid buffer_index {}", buffer_index);
|
||||||
ASSERT_MSG(BufferDescriptorA()[buffer_index].Size() > 0,
|
|
||||||
"BufferDescriptorA buffer_index {} is empty", buffer_index);
|
|
||||||
return BufferDescriptorA()[buffer_index].Size();
|
return BufferDescriptorA()[buffer_index].Size();
|
||||||
} else {
|
} else {
|
||||||
ASSERT_MSG(BufferDescriptorX().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorX().size() > buffer_index, { return 0; },
|
||||||
"BufferDescriptorX invalid buffer_index {}", buffer_index);
|
"BufferDescriptorX invalid buffer_index {}", buffer_index);
|
||||||
ASSERT_MSG(BufferDescriptorX()[buffer_index].Size() > 0,
|
|
||||||
"BufferDescriptorX buffer_index {} is empty", buffer_index);
|
|
||||||
return BufferDescriptorX()[buffer_index].Size();
|
return BufferDescriptorX()[buffer_index].Size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -356,14 +352,15 @@ std::size_t HLERequestContext::GetWriteBufferSize(std::size_t buffer_index) cons
|
||||||
const bool is_buffer_b{BufferDescriptorB().size() > buffer_index &&
|
const bool is_buffer_b{BufferDescriptorB().size() > buffer_index &&
|
||||||
BufferDescriptorB()[buffer_index].Size()};
|
BufferDescriptorB()[buffer_index].Size()};
|
||||||
if (is_buffer_b) {
|
if (is_buffer_b) {
|
||||||
ASSERT_MSG(BufferDescriptorB().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorB().size() > buffer_index, { return 0; },
|
||||||
"BufferDescriptorB invalid buffer_index {}", buffer_index);
|
"BufferDescriptorB invalid buffer_index {}", buffer_index);
|
||||||
return BufferDescriptorB()[buffer_index].Size();
|
return BufferDescriptorB()[buffer_index].Size();
|
||||||
} else {
|
} else {
|
||||||
ASSERT_MSG(BufferDescriptorC().size() > buffer_index,
|
ASSERT_OR_EXECUTE_MSG(BufferDescriptorC().size() > buffer_index, { return 0; },
|
||||||
"BufferDescriptorC invalid buffer_index {}", buffer_index);
|
"BufferDescriptorC invalid buffer_index {}", buffer_index);
|
||||||
return BufferDescriptorC()[buffer_index].Size();
|
return BufferDescriptorC()[buffer_index].Size();
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string HLERequestContext::Description() const {
|
std::string HLERequestContext::Description() const {
|
||||||
|
|
Reference in New Issue