github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-5216 Correct BSim signature apply bug

Browse Source
This commit is contained in:
ghidra1
2024-12-21 09:32:49 -05:00
parent d3e34f97cc
commit dacc9b226d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/program/util/FunctionUtility.java
View File

@@ -381,16 +381,17 @@ public class FunctionUtility {
return sourceConv;
}
boolean applyConventionName = sameLanguageAndCompilerSpec;
if (applyConventionName) {
String callingConvention = sourceFunction.getCallingConventionName();
if (applyConventionName &&
!CompilerSpec.CALLING_CONVENTION_default.equals(callingConvention)) {
DataTypeManager dtMgr = destinationFunction.getProgram().getDataTypeManager();
String name = destinationFunction.getCallingConventionName();
if (GenericCallingConvention
.getGenericCallingConvention(name) == GenericCallingConvention.unknown &&
!dtMgr.getKnownCallingConventionNames().contains(name)) {
if (GenericCallingConvention.getGenericCallingConvention(
callingConvention) == GenericCallingConvention.unknown &&
!dtMgr.getKnownCallingConventionNames().contains(callingConvention)) {
applyConventionName = false;
}
}
return applyConventionName ? sourceFunction.getCallingConventionName()
return applyConventionName ? callingConvention
: destinationFunction.getCallingConventionName();
}