ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13038 from Ferdi265/fix-rvz-clang-ub 

RVZ: Fix undefined behaviour when copying 0 bytes to a null pointer
This commit is contained in:
Tilka 2024-08-31 00:06:38 +01:00 committed by GitHub
parent 39e266c5bf 6245dcd57d
commit 8b7268ddef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DiscIO/WIABlob.cpp
View File

@ -765,7 +765,14 @@ bool WIARVZFileReader<RVZ>::Chunk::Decompress()
const size_t bytes_to_move = m_out.bytes_written - m_out_bytes_used_for_exceptions; const size_t bytes_to_move = m_out.bytes_written - m_out_bytes_used_for_exceptions;
DecompressionBuffer in{std::vector<u8>(bytes_to_move), bytes_to_move}; DecompressionBuffer in{std::vector<u8>(bytes_to_move), bytes_to_move};
std::memcpy(in.data.data(), m_out.data.data() + m_out_bytes_used_for_exceptions, bytes_to_move);
// Copying to a null pointer is undefined behaviour, so only copy when we
// actually have data to copy.
if (bytes_to_move > 0)
{
std::memcpy(in.data.data(), m_out.data.data() + m_out_bytes_used_for_exceptions,
bytes_to_move);
}
m_out.bytes_written = m_out_bytes_used_for_exceptions; m_out.bytes_written = m_out_bytes_used_for_exceptions;