2 files changed, 16 insertions, 9 deletions

diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index 2a6d43d2a..7d7542fc2 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/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:
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index 71c7587db..b6ac0a81a 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -65,13 +65,18 @@ static void DecryptSharedFont(const std::vector<u32>& input, Kernel::PhysicalMem
 void DecryptSharedFontToTTF(const std::vector<u32>& input, std::vector<u8>& output) {
     ASSERT_MSG(input[0] == EXPECTED_MAGIC, "Failed to derive key, unexpected magic number");
 
+    if (input.size() < 2) {
+        LOG_ERROR(Service_NS, "Input font is empty");
+        return;
+    }
+
     const u32 KEY = input[0] ^ EXPECTED_RESULT; // Derive key using an inverse xor
     std::vector<u32> transformed_font(input.size());
     // TODO(ogniK): Figure out a better way to do this
     std::transform(input.begin(), input.end(), transformed_font.begin(),
                    [&KEY](u32 font_data) { return Common::swap32(font_data ^ KEY); });
-    transformed_font[1] = Common::swap32(transformed_font[1]) ^ KEY; // "re-encrypt" the size
-    std::memcpy(output.data(), transformed_font.data() + 2, transformed_font.size() * sizeof(u32));
+    std::memcpy(output.data(), transformed_font.data() + 2,
+                (transformed_font.size() - 2) * sizeof(u32));
 }
 
 void EncryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output,