diff options
author | Alessandro Astone <ales.astone@gmail.com> | 2021-02-05 00:34:09 +0100 |
---|---|---|
committer | Alessandro Astone <ales.astone@gmail.com> | 2021-02-06 18:44:01 +0100 |
commit | 32d9a83f8e80ef34f79123d6cddeeb3e6454be80 (patch) | |
tree | b23d0e2e68060b84000c250cb2a29a997cc291cf /src/core/hle/service/ns/pl_u.cpp | |
parent | Merge pull request #5876 from lioncash/truncation (diff) | |
download | yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar.gz yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar.bz2 yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar.lz yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar.xz yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.tar.zst yuzu-32d9a83f8e80ef34f79123d6cddeeb3e6454be80.zip |
Diffstat (limited to 'src/core/hle/service/ns/pl_u.cpp')
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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, |