diff options
| -rw-r--r-- | arch/arm64/arch_arm64.cpp | 19 | ||||
| -rw-r--r-- | arch/mips/arch_mips.cpp | 52 |
2 files changed, 29 insertions, 42 deletions
diff --git a/arch/arm64/arch_arm64.cpp b/arch/arm64/arch_arm64.cpp index 68cfae5a..be856e79 100644 --- a/arch/arm64/arch_arm64.cpp +++ b/arch/arm64/arch_arm64.cpp @@ -2448,20 +2448,17 @@ class Arm64ImportedFunctionRecognizer : public FunctionRecognizer if (jumpOperand.GetSourceRegister<LLIL_REG>() != targetReg) return false; - Ref<Symbol> funcSym = Symbol::ImportedFunctionFromImportAddressSymbol(sym, func->GetStart()); // func is plt function + Ref<Symbol> funcSym = Symbol::ImportedFunctionFromImportAddressSymbol(sym, func->GetStart()); data->DefineAutoSymbol(funcSym); - for (auto& extSym : data->GetSymbolsByName(funcSym->GetRawName())) - { - if (extSym->GetType() == ExternalSymbol) - { - DataVariable var; - if (data->GetDataVariableAtAddress(extSym->GetAddress(), var)) - { - func->ApplyImportedTypes(funcSym, var.type); - } - return true; + auto extSym = data->GetSymbolsByName(funcSym->GetRawName(), data->GetExternalNameSpace()); + if (!extSym.empty()) { + DataVariable var; + if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var)) + { + func->ApplyImportedTypes(funcSym, var.type); } + return true; } return false; } diff --git a/arch/mips/arch_mips.cpp b/arch/mips/arch_mips.cpp index 1fa6b169..7f4501ba 100644 --- a/arch/mips/arch_mips.cpp +++ b/arch/mips/arch_mips.cpp @@ -1747,18 +1747,15 @@ private: Ref<Symbol> funcSym = Symbol::ImportedFunctionFromImportAddressSymbol(sym, func->GetStart()); data->DefineAutoSymbol(funcSym); - for (auto& extSym : data->GetSymbolsByName(funcSym->GetRawName())) - { - if (extSym->GetType() == ExternalSymbol) - { - DataVariable var; - if (data->GetDataVariableAtAddress(extSym->GetAddress(), var)) - { - func->ApplyImportedTypes(funcSym, var.type); - } - return true; + auto extSym = data->GetSymbolsByName(funcSym->GetRawName(), data->GetExternalNameSpace()); + if (!extSym.empty()) { + DataVariable var; + if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var)) + { + func->ApplyImportedTypes(funcSym, var.type); } + return true; } return false; } @@ -1823,18 +1820,14 @@ private: if (pltSym) { - for (auto& extSym : data->GetSymbolsByName(pltSym->GetRawName())) - { - if (extSym->GetType() == ExternalSymbol) + auto extSym = data->GetSymbolsByName(pltSym->GetRawName(), data->GetExternalNameSpace()); + if (!extSym.empty()) { + DataVariable var; + if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var)) { - DataVariable var; - if (data->GetDataVariableAtAddress(extSym->GetAddress(), var)) - { - func->ApplyImportedTypes(pltSym, var.type); - } - - return true; + func->ApplyImportedTypes(pltSym, var.type); } + return true; } } @@ -1951,20 +1944,17 @@ private: Ref<Symbol> funcSym = Symbol::ImportedFunctionFromImportAddressSymbol(sym, func->GetStart()); data->DefineAutoSymbol(funcSym); - for (auto& extSym : data->GetSymbolsByName(funcSym->GetRawName())) - { - if (extSym->GetType() == ExternalSymbol) - { - DataVariable var; - if (data->GetDataVariableAtAddress(extSym->GetAddress(), var)) - { - func->ApplyImportedTypes(funcSym, var.type); - } - return true; + auto extSym = data->GetSymbolsByName(funcSym->GetRawName(), data->GetExternalNameSpace()); + if (!extSym.empty()) { + DataVariable var; + if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var)) + { + func->ApplyImportedTypes(funcSym, var.type); } + return true; } - return true; + return false; } |