ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[CPU] Fix off-by-one in max ordinals check

This commit is contained in:
Silent 2019-09-08 22:21:32 +02:00 committed by Rick Gibbed
parent 9205a6b062
commit f775fe8c83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/cpu/export_resolver.cc
View File

@ -58,7 +58,7 @@ Export* ExportResolver::GetExportByOrdinal(const std::string_view module_name,
uint16_t ordinal) { uint16_t ordinal) {
for (const auto& table : tables_) { for (const auto& table : tables_) {
if (xe::utf8::starts_with_case(module_name, table.module_name())) { if (xe::utf8::starts_with_case(module_name, table.module_name())) {
if (ordinal > table.exports_by_ordinal().size()) { if (ordinal >= table.exports_by_ordinal().size()) {
return nullptr; return nullptr;
} }
return table.exports_by_ordinal().at(ordinal); return table.exports_by_ordinal().at(ordinal);

2
src/xenia/cpu/xex_module.cc
View File

@ -127,7 +127,7 @@ uint32_t XexModule::GetProcAddress(uint16_t ordinal) const {
xex_security_info()->export_table); xex_security_info()->export_table);
ordinal -= export_table->base; ordinal -= export_table->base;
if (ordinal > export_table->count) { if (ordinal >= export_table->count) {
XELOGE("GetProcAddress({:03X}): ordinal out of bounds", ordinal); XELOGE("GetProcAddress({:03X}): ordinal out of bounds", ordinal);
return 0; return 0;
} }