OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 19:30:15 +00:00
Code Issues Projects Releases Wiki Activity

LDR fixup! VerifyStringLength

Browse Source
This commit is contained in:
wwylele 2016-08-16 11:35:37 +08:00
parent 0cec1cf59b
commit 09c6876ecb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/ldr_ro.cpp
View File

@ -635,7 +635,7 @@ class CROHelper final {
* @param size the size of the string, including the terminating 0 * @param size the size of the string, including the terminating 0
* @returns ResultCode RESULT_SUCCESS if the size matches, otherwise error code. * @returns ResultCode RESULT_SUCCESS if the size matches, otherwise error code.
*/ */
static ResultCode VerifyString(VAddr address, u32 size) { static ResultCode VerifyStringLength(VAddr address, u32 size) {
if (size != 0) { if (size != 0) {
if (Memory::Read8(address + size - 1) != 0) if (Memory::Read8(address + size - 1) != 0)
return CROFormatError(0x0B); return CROFormatError(0x0B);
@ -1575,7 +1575,7 @@ public:
return result; return result;
} }
result = VerifyString(GetField(ModuleNameOffset), GetField(ModuleNameSize)); result = VerifyStringLength(GetField(ModuleNameOffset), GetField(ModuleNameSize));
if (result.IsError()) { if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error verifying module name %08X", result.raw); LOG_ERROR(Service_LDR, "Error verifying module name %08X", result.raw);
return result; return result;
@ -1606,7 +1606,7 @@ public:
return result; return result;
} }
result = VerifyString(GetField(ExportStringsOffset), GetField(ExportStringsSize)); result = VerifyStringLength(GetField(ExportStringsOffset), GetField(ExportStringsSize));
if (result.IsError()) { if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error verifying export strings %08X", result.raw); LOG_ERROR(Service_LDR, "Error verifying export strings %08X", result.raw);
return result; return result;
@ -1642,7 +1642,7 @@ public:
return result; return result;
} }
result = VerifyString(GetField(ImportStringsOffset), GetField(ImportStringsSize)); result = VerifyStringLength(GetField(ImportStringsOffset), GetField(ImportStringsSize));
if (result.IsError()) { if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error verifying import strings %08X", result.raw); LOG_ERROR(Service_LDR, "Error verifying import strings %08X", result.raw);
return result; return result;