RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-10-12 02:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

unself: fix overflow checks

Browse Source
This commit is contained in:
Megamouse
2026-08-10 17:35:26 +02:00
parent 8cde4b2153
commit eaef23d43a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Crypto/unself.cpp
+5 -5
View File
@@ -688,7 +688,7 @@ bool SCEDecrypter::LoadMetadata(const u8 erk[32], const u8 riv[16])
const usz data_keys_offset = sizeof(meta_hdr) + meta_hdr.section_count * sizeof(MetadataSectionHeader);
ensure(metadata_headers.size() >= (data_keys_offset + data_keys.size()));
ensure(data_keys.size() > (u64{umax} - data_keys_offset)); // Check for overflow
ensure(data_keys.size() <= (usz{umax} - data_keys_offset)); // Check for overflow
std::memcpy(data_keys.data(), metadata_headers.data() + data_keys_offset, data_keys.size());
return true;
@@ -743,7 +743,7 @@ bool SCEDecrypter::DecryptData()
// Copy the decrypted data.
ensure(data_buf.size() >= (buf.size() + data_buf_offset));
ensure(buf.size() > (u64{umax} - static_cast<u64>(data_buf_offset))); // Check for overflow
ensure(buf.size() <= (usz{umax} - static_cast<usz>(data_buf_offset))); // Check for overflow
std::memcpy(data_buf.data() + data_buf_offset, buf.data(), buf.size());
}
}
@@ -754,7 +754,7 @@ bool SCEDecrypter::DecryptData()
sce_f.read(buf.data(), buf.size());
ensure(data_buf.size() >= (buf.size() + data_buf_offset));
ensure(buf.size() > (u64{umax} - static_cast<u64>(data_buf_offset))); // Check for overflow
ensure(buf.size() <= (usz{umax} - static_cast<usz>(data_buf_offset))); // Check for overflow
std::memcpy(data_buf.data() + data_buf_offset, buf.data(), buf.size());
}
@@ -1195,7 +1195,7 @@ bool SELFDecrypter::LoadMetadata(const u8* klic_key)
const usz data_keys_offset = sizeof(meta_hdr) + meta_hdr.section_count * sizeof(MetadataSectionHeader);
ensure(metadata_headers.size() >= (data_keys_offset + data_keys.size()));
ensure(data_keys.size() > (u64{umax} - data_keys_offset)); // Check for overflow
ensure(data_keys.size() <= (usz{umax} - data_keys_offset)); // Check for overflow
std::memcpy(data_keys.data(), metadata_headers.data() + data_keys_offset, data_keys.size());
return true;
@@ -1254,7 +1254,7 @@ bool SELFDecrypter::DecryptData()
// Copy the decrypted data.
ensure(data_buf.size() >= (buf.size() + data_buf_offset));
ensure(buf.size() > (u64{umax} - static_cast<u64>(data_buf_offset))); // Check for overflow
ensure(buf.size() <= (usz{umax} - static_cast<usz>(data_buf_offset))); // Check for overflow
std::memcpy(data_buf.data() + data_buf_offset, buf.data(), buf.size());
// Advance the buffer's offset.
rpcs3/Crypto/unself.h
+1 -1
View File
@@ -546,7 +546,7 @@ private:
{
// Seek to the program header data offset and write the data.
ensure(data_buf.size() >= (hdr.data_size + data_buf_offset));
ensure(hdr.data_size > (u64{umax} - static_cast<u64>(data_buf_offset))); // Check for overflow
ensure(hdr.data_size <= (u64{umax} - static_cast<u64>(data_buf_offset))); // Check for overflow
e.seek(phdr.p_offset);
e.write(data_buf.data() + data_buf_offset, hdr.data_size);