diff options
| author | 2019-09-23 09:52:49 -0400 | |
|---|---|---|
| committer | 2019-10-13 13:46:27 -0400 | |
| commit | 1911f853918669f3258259b51ebc3dac19ed61ef (patch) | |
| tree | da540e440ccbff0a21a4492f2fdb1cf87cc6b878 /src/core/file_sys | |
| parent | pl_u: Use kernel physical memory (diff) | |
| download | yuzu-1911f853918669f3258259b51ebc3dac19ed61ef.tar.gz yuzu-1911f853918669f3258259b51ebc3dac19ed61ef.tar.xz yuzu-1911f853918669f3258259b51ebc3dac19ed61ef.zip | |
pl_u: Fix mismatched rebase size error in font encryption
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/system_archive/shared_font.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/file_sys/system_archive/shared_font.cpp b/src/core/file_sys/system_archive/shared_font.cpp index 5bb596824..2c05eb42e 100644 --- a/src/core/file_sys/system_archive/shared_font.cpp +++ b/src/core/file_sys/system_archive/shared_font.cpp | |||
| @@ -18,16 +18,14 @@ namespace { | |||
| 18 | 18 | ||
| 19 | template <std::size_t Size> | 19 | template <std::size_t Size> |
| 20 | VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) { | 20 | VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) { |
| 21 | std::vector<u8> vec(Size); | 21 | std::vector<u32> vec(Size / sizeof(u32)); |
| 22 | std::memcpy(vec.data(), data.data(), vec.size()); | 22 | std::memcpy(vec.data(), data.data(), vec.size() * sizeof(u32)); |
| 23 | 23 | ||
| 24 | Kernel::PhysicalMemory bfttf(Size + sizeof(u64)); | 24 | std::vector<u8> bfttf(Size + sizeof(u64)); |
| 25 | 25 | ||
| 26 | Service::NS::EncryptSharedFont(vec, bfttf); | 26 | u64 offset = 0; |
| 27 | 27 | Service::NS::EncryptSharedFont(vec, bfttf, offset); | |
| 28 | std::vector<u8> bfttf_vec(Size + sizeof(u64)); | 28 | return std::make_shared<VectorVfsFile>(std::move(bfttf), name); |
| 29 | std::memcpy(bfttf_vec.data(), bfttf.data(), bfttf_vec.size()); | ||
| 30 | return std::make_shared<VectorVfsFile>(std::move(bfttf_vec), name); | ||
| 31 | } | 29 | } |
| 32 | 30 | ||
| 33 | } // Anonymous namespace | 31 | } // Anonymous namespace |