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

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-12-4-23'

Browse source
This commit is contained in:
ghidra1 2023-12-04 13:56:04 -05:00
commit 1ebcfd58bc
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/strings/EncodedStringsPlugin.java
View file

@ -80,11 +80,12 @@ public class EncodedStringsPlugin extends ProgramPlugin {
private void registerOptions() { private void registerOptions() {
ToolOptions options = tool.getOptions(STRINGS_OPTION_NAME); ToolOptions options = tool.getOptions(STRINGS_OPTION_NAME);
options.registerOption(CHARSET_OPTIONNAME, CHARSET_DEFAULT_VALUE, null, options.registerOption(CHARSET_OPTIONNAME, CHARSET_DEFAULT_VALUE, HELP_LOCATION,
"Name of default charset."); "Name of default charset.");
options.registerOption(STRINGMODEL_FILENAME_OPTIONNAME, STRINGMODEL_FILENAME_DEFAULT, null, options.registerOption(STRINGMODEL_FILENAME_OPTIONNAME, STRINGMODEL_FILENAME_DEFAULT,
HELP_LOCATION,
"Name of default string model file."); "Name of default string model file.");
options.registerOption(TRANSLATE_SERVICE_OPTIONNAME, "", null, options.registerOption(TRANSLATE_SERVICE_OPTIONNAME, "", HELP_LOCATION,
"Name of default translation service."); "Name of default translation service.");
} }

3
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java
View file

@ -1012,7 +1012,8 @@ public class CodeBrowserOptionsTest extends AbstractGhidraHeadedIntegrationTest
// it has a help location; is it valid? // it has a help location; is it valid?
if (hl != null && !isValidHelpLocation(hl)) { if (hl != null && !isValidHelpLocation(hl)) {
missing.add(name + "." + name); isValidHelpLocation(hl);
missing.add(options.getName() + "." + name);
} }
} }
} }