mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix EDATADecrypter::ReadData

Browse source
This commit is contained in:
Eladash 2024-02-13 22:21:48 +02:00 • committed by Elad.Ash
parent f87e11d16a
commit ed66e9e9b9
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/Crypto/unedat.cpp
View file

@ -895,6 +895,7 @@ u64 EDATADecrypter::ReadData(u64 pos, u8* data, u64 size)
for (u32 i = starting_block; i < ending_block; i++)
{
u64 res = decrypt_block(&edata_file, data_buf.data(), &edatHeader, &npdHeader, reinterpret_cast<uchar*>(&dec_key), i, total_blocks, edatHeader.file_size);
if (res == umax)
{
edat_log.error("Error Decrypting data");
@ -902,13 +903,19 @@ u64 EDATADecrypter::ReadData(u64 pos, u8* data, u64 size)
}
const usz skip_start = (i == starting_block ? startOffset : 0);
const usz end_block = (i != total_blocks - 1 ? edatHeader.block_size : edatHeader.file_size % edatHeader.block_size);
const usz skip_end = (i == ending_block - 1 ? (end_block - (startOffset + size)) % edatHeader.block_size : 0);
std::memcpy(data + writeOffset, data_buf.data() + skip_start, res - skip_start - skip_end);
std::memset(data_buf.data(), 0, res - skip_start - skip_end);
if (skip_start >= res)
{
break;
}
writeOffset += res - skip_start - skip_end;
const usz end_pos = (i != total_blocks - 1 ? edatHeader.block_size : (edatHeader.file_size - 1) % edatHeader.block_size + 1);
const usz read_end = std::min<usz>(res, i == ending_block - 1 ? std::min<usz>(end_pos, (startOffset + size - 1) % edatHeader.block_size + 1) : end_pos);
std::memcpy(data + writeOffset, data_buf.data() + skip_start, read_end - skip_start);
std::memset(data_buf.data(), 0, read_end - skip_start);
writeOffset += read_end - skip_start;
}
return writeOffset;