github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6248_dev747368_fix_searchforencodedstrings_dialog_titlebar'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-12-18 12:58:25 -05:00
parent b9995e83af 3a54baa89e
commit 59a9fd882d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsDialog.java
View File

@@ -1103,9 +1103,11 @@ public class EncodedStringsDialog extends DialogComponentProvider {
}
private static String makeTitleString(AddressSetView addrs) {
return "Search For Encoded Strings - %s (%s - %s)".formatted(
formatLength(addrs.getNumAddresses(), "addresses"), addrs.getMinAddress(),
addrs.getMaxAddress());
String addrRangeStr = !addrs.isEmpty()
? "(%s - %s)".formatted(addrs.getMinAddress(), addrs.getMaxAddress())
: "";
return "Search For Encoded Strings - %s %s"
.formatted(formatLength(addrs.getNumAddresses(), "addresses"), addrRangeStr);
}
private static boolean charsetExists(String charsetName) {

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java
View File

@@ -113,7 +113,7 @@ public class EncodedStringsPlugin extends ProgramPlugin {
}
private void showSearchForEncodedStrings(NavigatableActionContext lac) {
AddressSetView addrs = lac.hasSelection()
AddressSetView addrs = lac.hasSelection() && !lac.getSelection().isEmpty()
? lac.getSelection()
: lac.getProgram().getMemory().getAllInitializedAddressSet();
EncodedStringsDialog dlg = new EncodedStringsDialog(this, lac.getProgram(), addrs);