瀏覽代碼

lm: Fix ReadLeb128

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
Chloe Marcec 5 年之前
父節點
當前提交
9d5a56a40b
共有 1 個文件被更改,包括 9 次插入7 次删除
  1. 9 7
      src/core/hle/service/lm/lm.cpp

+ 9 - 7
src/core/hle/service/lm/lm.cpp

@@ -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: