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

lm: Fix ReadLeb128

Browse source 
Fixes assertion on Bloodstained Ritual of the Night.

We would over read sometimes, this is fixed by checking if the top bit is set in the first iteration. We also lock the loop off to be only the max size of the type we can fit. Finally we changed an incorrect print of "DEBUG" to "TRACE" to reflect the proper log severity
This commit is contained in:
Chloe Marcec 2021-02-07 23:52:56 +11:00
parent 4a01812ebe
commit 9d5a56a40b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/hle/service/lm/lm.cpp
View file

@ -143,17 +143,19 @@ private:
rb.Push(RESULT_SUCCESS);
}
u32 ReadLeb128(const std::vector<u8>& data, std::size_t& offset) {
u32 result{};
u64 ReadLeb128(const std::vector<u8>& data, std::size_t& offset) {
u64 result{};
u32 shift{};
do {
result |= (data[offset] & 0x7f) << shift;
for (std::size_t i = 0; i < sizeof(u64); i++) {
const auto v = data[offset];
result |= (static_cast<u64>(v & 0x7f) << shift);
shift += 7;
offset++;
if (offset >= data.size()) {
if (offset >= data.size() || ((v & 0x80) == 0)) {
break;
}
} while ((data[offset] & 0x80) != 0);
}
return result;
}
@ -262,7 +264,7 @@ private:
switch (entry.severity) {
case LogSeverity::Trace:
LOG_DEBUG(Service_LM, "LogManager DEBUG ({}):\n{}", DestinationToString(destination),
LOG_DEBUG(Service_LM, "LogManager TRACE ({}):\n{}", DestinationToString(destination),
output_log);
break;
case LogSeverity::Info: