citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #589 from kevinhartman/config-errors 

Fix errorcodes for bad config block request
This commit is contained in:
bunnei 2015-03-09 15:44:34 -04:00
parent 3da94a597b a6fdb8f217
commit 8a1cc5b805
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/service/cfg/cfg.cpp
View File

@ -49,12 +49,17 @@ ResultCode GetConfigInfoBlock(u32 block_id, u32 size, u32 flag, u8* output) {
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);
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