Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7437: Fixing BatchIimportDialog NPE

Ryan Kurtz23ef3bf7442b
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchImportDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchImportDialog.java
index e381784a70..69f60cb1f3 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchImportDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchImportDialog.java
@@ -407,8 +407,10 @@ public class BatchImportDialog extends DialogComponentProvider {
.collect(Collectors.toList());
BatchGroupLoadSpec selectedLoadSpec = group.getSelectedBatchGroupLoadSpec();
+ LanguageCompilerSpecPair selectedLcsPair =
+ selectedLoadSpec != null ? selectedLoadSpec.lcsPair() : null;
ImporterLanguageDialog dialog =
- new ImporterLanguageDialog(loadSpecs, tool, selectedLoadSpec.lcsPair());
+ new ImporterLanguageDialog(loadSpecs, tool, selectedLcsPair);
dialog.show(getComponent());
LanguageCompilerSpecPair dialogResult = dialog.getSelectedLanguage();
if (dialogResult != null) {