Browse Source
Merge pull request #1461 from lioncash/warn
ips_layer: Silence truncation and conversion warnings
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/core/file_sys/ips_layer.cpp
|
|
|
@ -107,12 +107,12 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) { |
|
|
|
return nullptr; |
|
|
|
|
|
|
|
if (real_offset + rle_size > in_data.size()) |
|
|
|
rle_size = in_data.size() - real_offset; |
|
|
|
rle_size = static_cast<u16>(in_data.size() - real_offset); |
|
|
|
std::memset(in_data.data() + real_offset, data.get(), rle_size); |
|
|
|
} else { // Standard Patch
|
|
|
|
auto read = data_size; |
|
|
|
if (real_offset + read > in_data.size()) |
|
|
|
read = in_data.size() - real_offset; |
|
|
|
read = static_cast<u16>(in_data.size() - real_offset); |
|
|
|
if (ips->Read(in_data.data() + real_offset, read, offset) != data_size) |
|
|
|
return nullptr; |
|
|
|
offset += data_size; |
|
|
|
@ -265,7 +265,7 @@ void IPSwitchCompiler::Parse() { |
|
|
|
if (patch_line.length() < 11) |
|
|
|
break; |
|
|
|
auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16); |
|
|
|
offset += offset_shift; |
|
|
|
offset += static_cast<unsigned long>(offset_shift); |
|
|
|
|
|
|
|
std::vector<u8> replace; |
|
|
|
// 9 - first char of replacement val
|
|
|
|
|