Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-25 20:45:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
dragonmacher
2026-05-15 18:00:07 -04:00
parent 01fb421076
commit 9cc4557113
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/VariableAnnotatedStringHandler.java
+16 -8
View File
@@ -89,17 +89,19 @@ public class VariableAnnotatedStringHandler implements AnnotatedStringHandler {
return createPlaceholderString(prototypeString, text);
}
String functionName = text[2];
Function function = getFunction(program, functionName);
String entry = text[2];
Function function = getFunctionAt(program, entry);
if (function == null) {
throw new AnnotationException("Could not find function \"" + functionName + "\"");
throw new AnnotationException("Could not find function \"" + entry + "\"");
}
String address = text[1];
Variable var = getVariable(function, address);
if (var == null) {
throw new AnnotationException("Could not find variable in function \"" +
functionName + "\" matching \"" + text[1] + "\".");
String functionName = function.getName();
throw new AnnotationException(
"Could not find variable at address %s in function %s".formatted(functionName,
address));
}
return new AttributedString(var.getName(), prototypeString.getColor(0),
@@ -113,9 +115,9 @@ public class VariableAnnotatedStringHandler implements AnnotatedStringHandler {
prototypeString.getFontMetrics(0));
}
private static Function getFunction(Program program, String name) {
private Function getFunction(Program program, String value) {
FunctionManager manager = program.getFunctionManager();
for (Symbol s : NamespaceUtils.getSymbols(name, program)) {
for (Symbol s : NamespaceUtils.getSymbols(value, program)) {
Address addr = s.getAddress();
Function function = manager.getFunctionAt(addr);
if (function != null) {
@@ -124,7 +126,13 @@ public class VariableAnnotatedStringHandler implements AnnotatedStringHandler {
}
// if we get here, then see if the value is an address
Address addr = program.getAddressFactory().getAddress(name);
return getFunctionAt(program, value);
}
private Function getFunctionAt(Program program, String address) {
FunctionManager manager = program.getFunctionManager();
AddressFactory af = program.getAddressFactory();
Address addr = af.getAddress(address);
if (addr != null) {
Function function = manager.getFunctionAt(addr);
if (function != null) {