Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
ghidra1 2024-04-22 17:58:29 -04:00
commit 422a142cb3
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java
View File

@ -457,10 +457,7 @@ public class MemSearchPlugin extends Plugin implements OptionsChangeListener,
searchDialog.setStatusText("Searching...");
SearchData searchData = info.getSearchData();
byte[] searchBytes = searchData.getBytes();
int selectionSize = searchBytes.length == 0 ? 1 : searchBytes.length;
MemSearchTableModel model = new MemSearchTableModel(tool, selectionSize, program, info,
MemSearchTableModel model = new MemSearchTableModel(tool, program, info,
getSearchStartAddress(info), navigatable.getSelection());
currentResultsTableProvider =

19
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchTableModel.java
View File

@ -34,16 +34,12 @@ public class MemSearchTableModel extends AddressBasedTableModel<MemSearchResult>
private Address startAddress;
private MemorySearchAlgorithm algorithm;
private int selectionSize = 1;
MemSearchTableModel(ServiceProvider serviceProvider, int selectionSize, Program program,
SearchInfo searchInfo, Address searchStartAddress, ProgramSelection programSelection) {
MemSearchTableModel(ServiceProvider serviceProvider, Program program, SearchInfo searchInfo,
Address searchStartAddress, ProgramSelection programSelection) {
super("Memory Search", serviceProvider, program, null, true);
this.searchInfo = searchInfo;
this.startAddress = searchStartAddress;
this.selection = programSelection;
this.selectionSize = selectionSize;
}
public boolean isSortedOnAddress() {
@ -91,14 +87,11 @@ public class MemSearchTableModel extends AddressBasedTableModel<MemSearchResult>
@Override
public ProgramSelection getProgramSelection(int[] rows) {
if (selectionSize == 1) {
return super.getProgramSelection(rows);
}
int addOn = selectionSize - 1;
AddressSet addressSet = new AddressSet();
for (int element : rows) {
Address minAddr = getAddress(element);
for (int row : rows) {
MemSearchResult result = getRowObject(row);
int addOn = result.getLength() - 1;
Address minAddr = getAddress(row);
Address maxAddr = minAddr;
try {
maxAddr = minAddr.addNoWrap(addOn);