Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 23:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-349 - Fixed memory search highlight exception

Browse Source
This commit is contained in:
dragonmacher 2020-11-13 18:29:09 -05:00
parent 8f1be0932a
commit f30666e4e6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,8 +373,8 @@ public class MemSearchPlugin extends Plugin implements OptionsChangeListener,
return !(context instanceof RestrictedAddressSetContext) && searchInfo != null;
}
};
searchAgainAction.setHelpLocation(
new HelpLocation(HelpTopics.SEARCH, searchAgainAction.getName()));
searchAgainAction
.setHelpLocation(new HelpLocation(HelpTopics.SEARCH, searchAgainAction.getName()));
menuPath = new String[] { "&Search", "Repeat Memory Search" };
searchAgainAction.setMenuBarData(new MenuData(menuPath, "search"));
searchAgainAction.setKeyBindingData(new KeyBindingData(KeyEvent.VK_F3, 0));
@ -750,14 +750,19 @@ public class MemSearchPlugin extends Plugin implements OptionsChangeListener,
private Color getHighlightColor(Address highlightStart, int highlightLength) {
ProgramLocation location = navigatable != null ? navigatable.getLocation() : null;
if (location instanceof BytesFieldLocation) {
BytesFieldLocation byteLoc = (BytesFieldLocation) location;
Address byteAddress = byteLoc.getAddressForByte();
if (!(location instanceof BytesFieldLocation)) {
return defaultHighlightColor;
}
BytesFieldLocation byteLoc = (BytesFieldLocation) location;
Address byteAddress = byteLoc.getAddressForByte();
if (highlightStart.hasSameAddressSpace(byteAddress)) {
long diff = byteAddress.subtract(highlightStart);
if (diff >= 0 && diff < highlightLength) {
return activeHighlightColor;
return activeHighlightColor; // the current location is in the highlight
}
}
return defaultHighlightColor;
}