Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6008 Corrected regression bug for VT function stringable Imported priority check

ghidra12b5ba243278c
diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/stringable/FunctionSignatureStringable.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/stringable/FunctionSignatureStringable.java
index eb9d0e3d86..4453fe85a3 100644
--- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/stringable/FunctionSignatureStringable.java
+++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/stringable/FunctionSignatureStringable.java
@@ -996,10 +996,12 @@ public class FunctionSignatureStringable extends Stringable {
if (first == second) {
return replaceSamePriorityNames;
}
- // NOTE: If a new SourceType is added with a priority in between IMPORTED and USER_DEFINED
- // VT and this code will need to change.
+ // Force IMPORTED to have highest priority
if (first == SourceType.IMPORTED) {
- return true; // IMPORTED is highest priority
+ return true;
+ }
+ else if (second == SourceType.IMPORTED) {
+ return false;
}
return first.isHigherPriorityThan(second);
}