artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #13175 from liamwhite/asan

Browse source 
general: fix asan errors
This commit is contained in:
liamwhite 2024-02-27 09:42:59 -05:00 committed by GitHub
parent f1b1530249 c7174d5f61
commit 30567a5909
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/file_sys/fssystem/fssystem_aes_xts_storage.cpp
View file

@ -31,8 +31,8 @@ AesXtsStorage::AesXtsStorage(VirtualFile base, const void* key1, const void* key
ASSERT(iv_size == IvSize); ASSERT(iv_size == IvSize);
ASSERT(Common::IsAligned(m_block_size, AesBlockSize)); ASSERT(Common::IsAligned(m_block_size, AesBlockSize));
std::memcpy(m_key.data() + 0, key1, KeySize); std::memcpy(m_key.data() + 0, key1, KeySize / 2);
std::memcpy(m_key.data() + 0x10, key2, KeySize); std::memcpy(m_key.data() + 0x10, key2, KeySize / 2);
std::memcpy(m_iv.data(), iv, IvSize); std::memcpy(m_iv.data(), iv, IvSize);
m_cipher.emplace(m_key, Core::Crypto::Mode::XTS); m_cipher.emplace(m_key, Core::Crypto::Mode::XTS);

14
src/core/hle/service/server_manager.cpp
View file

@ -93,13 +93,19 @@ ServerManager::~ServerManager() {
m_threads.clear(); m_threads.clear();
// Clean up ports. // Clean up ports.
for (auto it = m_servers.begin(); it != m_servers.end(); it = m_servers.erase(it)) { auto port_it = m_servers.begin();
delete std::addressof(*it); while (port_it != m_servers.end()) {
auto* const port = std::addressof(*port_it);
port_it = m_servers.erase(port_it);
delete port;
} }
// Clean up sessions. // Clean up sessions.
for (auto it = m_sessions.begin(); it != m_sessions.end(); it = m_sessions.erase(it)) { auto session_it = m_sessions.begin();
delete std::addressof(*it); while (session_it != m_sessions.end()) {
auto* const session = std::addressof(*session_it);
session_it = m_sessions.erase(session_it);
delete session;
} }
// Close wakeup event. // Close wakeup event.