yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #5878 from aleasto/master 

pl_u: Fix read out of bounds
This commit is contained in:
Morph 2021-02-07 22:20:47 +08:00 committed by GitHub
parent 4a01812ebe 32d9a83f8e
commit 458be11f93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/hle/service/ns/pl_u.cpp
View File

@ -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) { void DecryptSharedFontToTTF(const std::vector<u32>& input, std::vector<u8>& output) {
ASSERT_MSG(input[0] == EXPECTED_MAGIC, "Failed to derive key, unexpected magic number"); 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 const u32 KEY = input[0] ^ EXPECTED_RESULT; // Derive key using an inverse xor
std::vector<u32> transformed_font(input.size()); std::vector<u32> transformed_font(input.size());
// TODO(ogniK): Figure out a better way to do this // TODO(ogniK): Figure out a better way to do this
std::transform(input.begin(), input.end(), transformed_font.begin(), std::transform(input.begin(), input.end(), transformed_font.begin(),
[&KEY](u32 font_data) { return Common::swap32(font_data ^ KEY); }); [&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,
std::memcpy(output.data(), transformed_font.data() + 2, transformed_font.size() * sizeof(u32)); (transformed_font.size() - 2) * sizeof(u32));
} }
void EncryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output, void EncryptSharedFont(const std::vector<u32>& input, std::vector<u8>& output,