diff options
author | bunnei <bunneidev@gmail.com> | 2018-10-24 22:28:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-24 22:28:17 +0200 |
commit | cdd499c261c289e5718e3d0897fc0cdfab483e7e (patch) | |
tree | ba88e88eaf5dc45d8ac641176b121862d88961d8 | |
parent | Merge pull request #1559 from lioncash/log (diff) | |
parent | vfs: Handle failure of file reading within VfsRawCopy() (diff) | |
download | yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar.gz yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar.bz2 yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar.lz yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar.xz yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.tar.zst yuzu-cdd499c261c289e5718e3d0897fc0cdfab483e7e.zip |
-rw-r--r-- | src/core/crypto/key_manager.cpp | 1 | ||||
-rw-r--r-- | src/core/file_sys/vfs.cpp | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index fd0786068..fefc3c747 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -713,7 +713,6 @@ void KeyManager::DeriveBase() { const auto sbk = GetKey(S128KeyType::SecureBoot); const auto tsec = GetKey(S128KeyType::TSEC); - const auto master_source = GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::Master)); for (size_t i = 0; i < revisions.size(); ++i) { if (!revisions[i]) diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp index bfe50da73..3824c74e0 100644 --- a/src/core/file_sys/vfs.cpp +++ b/src/core/file_sys/vfs.cpp @@ -472,10 +472,14 @@ bool VfsRawCopy(const VirtualFile& src, const VirtualFile& dest, std::size_t blo std::vector<u8> temp(std::min(block_size, src->GetSize())); for (std::size_t i = 0; i < src->GetSize(); i += block_size) { const auto read = std::min(block_size, src->GetSize() - i); - const auto block = src->Read(temp.data(), read, i); - if (dest->Write(temp.data(), read, i) != read) + if (src->Read(temp.data(), read, i) != read) { return false; + } + + if (dest->Write(temp.data(), read, i) != read) { + return false; + } } return true; |