yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5883_ghidragon_memory_search_bug'

Browse source
This commit is contained in:
Ryan Kurtz 2025-09-09 07:55:31 -04:00
commit 998bea8c50
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/features/base/memsearch/gui/MemorySearchOptionsPanel.java
View file

@ -114,8 +114,9 @@ class MemorySearchOptionsPanel extends JPanel {
innerPanel.add(label); innerPanel.add(label);
Integer[] decimalSizes = new Integer[] { 1, 2, 3, 4, 5, 6, 7, 8, 16 }; Integer[] decimalSizes = new Integer[] { 1, 2, 3, 4, 5, 6, 7, 8, 16 };
int decimalByteSize = model.getDecimalByteSize();
decimalByteSizeCombo = new GComboBox<>(decimalSizes); decimalByteSizeCombo = new GComboBox<>(decimalSizes);
decimalByteSizeCombo.setSelectedItem(4); decimalByteSizeCombo.setSelectedItem(decimalByteSize);
decimalByteSizeCombo.addItemListener(this::byteSizeComboChanged); decimalByteSizeCombo.addItemListener(this::byteSizeComboChanged);
decimalByteSizeCombo.setToolTipText("Size of decimal values in bytes"); decimalByteSizeCombo.setToolTipText("Size of decimal values in bytes");
innerPanel.add(decimalByteSizeCombo); innerPanel.add(decimalByteSizeCombo);
@ -126,6 +127,7 @@ class MemorySearchOptionsPanel extends JPanel {
"Sets whether decimal values should be interpreted as unsigned values"); "Sets whether decimal values should be interpreted as unsigned values");
decimalUnsignedCheckbox.addActionListener( decimalUnsignedCheckbox.addActionListener(
e -> model.setDecimalUnsigned(decimalUnsignedCheckbox.isSelected())); e -> model.setDecimalUnsigned(decimalUnsignedCheckbox.isSelected()));
decimalUnsignedCheckbox.setSelected(model.isDecimalUnsigned());
panel.add(decimalUnsignedCheckbox); panel.add(decimalUnsignedCheckbox);
return panel; return panel;
@ -205,9 +207,10 @@ class MemorySearchOptionsPanel extends JPanel {
Charset[] supportedCharsets = Charset[] supportedCharsets =
{ StandardCharsets.US_ASCII, StandardCharsets.UTF_8, StandardCharsets.UTF_16 }; { StandardCharsets.US_ASCII, StandardCharsets.UTF_8, StandardCharsets.UTF_16 };
Charset charSet = model.getStringCharset();
charsetCombo = new GComboBox<>(supportedCharsets); charsetCombo = new GComboBox<>(supportedCharsets);
charsetCombo.setName("Encoding Options"); charsetCombo.setName("Encoding Options");
charsetCombo.setSelectedIndex(0); charsetCombo.setSelectedItem(charSet);
charsetCombo.addItemListener(this::encodingComboChanged); charsetCombo.addItemListener(this::encodingComboChanged);
charsetCombo.setToolTipText("Character encoding for translating strings to bytes"); charsetCombo.setToolTipText("Character encoding for translating strings to bytes");