Skip to content

Ghidra is a software reverse engineering (SRE) framework

Merge remote-tracking branch 'origin/GP-1-dragonmcher-find-results-table-context-sorting'

Ryan Kurtzda798dfea67e
diff --cc Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/DecompilerSearcher.java
index d9de313e31,f397a18fa5..3c26e083cd
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/DecompilerSearcher.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/DecompilerSearcher.java
@@@ -242,9 -241,9 +242,9 @@@ public class DecompilerSearcher impleme
FieldLineLocation lineInfo = getFieldIndexFromOffset(match.start, field);
FieldLocation fieldLocation =
- new FieldLocation(i, lineInfo.fieldNumber(), 0, lineInfo.column());
+ new FieldLocation(i, lineInfo.fieldNumber(), lineInfo.row(), lineInfo.column());
int lineNumber = lineInfo.lineNumber();
- SearchLocationContext context = createContext(fullLine, match);
+ SearchLocationContext context = createContext(fullLine, lineNumber, match);
return new DecompilerSearchLocation(fieldLocation, match.start, match.end - 1,
searchString, true, field.getText(), lineNumber, context);
}