summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-03-09 20:44:34 +0100
committerbunnei <bunneidev@gmail.com>2015-03-09 20:44:34 +0100
commit8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec (patch)
treee6ca78f34ec9359cba2efa4b5678a32ca29c6710 /src/core/hle
parentMerge pull request #634 from linkmauve/logging-performances (diff)
parentFix error message for bad config block request. (diff)
downloadyuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar.gz
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar.bz2
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar.lz
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar.xz
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.tar.zst
yuzu-8a1cc5b8058686e9c73a363f22c48c4a3d10d4ec.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/cfg/cfg.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 1eb2562d8..6adadb224 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -48,13 +48,18 @@ ResultCode GetConfigInfoBlock(u32 block_id, u32 size, u32 flag, u8* output) {
SaveFileConfig* config = reinterpret_cast<SaveFileConfig*>(cfg_config_file_buffer.data());
auto itr = std::find_if(std::begin(config->block_entries), std::end(config->block_entries),
- [&](const SaveConfigBlockEntry& entry) {
- return entry.block_id == block_id && entry.size == size && (entry.flags & flag);
- });
+ [&](const SaveConfigBlockEntry& entry) {
+ return entry.block_id == block_id && (entry.flags & flag);
+ });
if (itr == std::end(config->block_entries)) {
- LOG_ERROR(Service_CFG, "Config block %u with size %u and flags %u not found", block_id, size, flag);
- return ResultCode(-1); // TODO(Subv): Find the correct error code
+ LOG_ERROR(Service_CFG, "Config block %u with flags %u was not found", block_id, flag);
+ return ResultCode(ErrorDescription::NotFound, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent);
+ }
+
+ if (itr->size != size) {
+ LOG_ERROR(Service_CFG, "Invalid size %u for config block %u with flags %u", size, block_id, flag);
+ return ResultCode(ErrorDescription::InvalidSize, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent);
}
// The data is located in the block header itself if the size is less than 4 bytes