yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge branch 'Ghidra_12.0'

Browse source
This commit is contained in:
ghidra1 2025-09-26 11:04:51 -04:00
commit c16396d235
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/stringable/FunctionSignatureStringable.java
View file

@ -996,10 +996,12 @@ public class FunctionSignatureStringable extends Stringable {
if (first == second) { if (first == second) {
return replaceSamePriorityNames; return replaceSamePriorityNames;
} }
// NOTE: If a new SourceType is added with a priority in between IMPORTED and USER_DEFINED // Force IMPORTED to have highest priority
// VT and this code will need to change.
if (first == SourceType.IMPORTED) { if (first == SourceType.IMPORTED) {
return true; // IMPORTED is highest priority return true;
}
else if (second == SourceType.IMPORTED) {
return false;
} }
return first.isHigherPriorityThan(second); return first.isHigherPriorityThan(second);
} }