Skip to content

Commit b95350f

Browse files
committed
GP-4919: Fixing exception that could occur if LoadSpec wasn't found for
some reason (NationalSecurityAgency#7185)
1 parent 760f2a2 commit b95350f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ImporterUtilities.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -549,14 +549,19 @@ static LoadSpec getLoadSpec(ByteProvider provider, Program program) {
549549
LoaderMap loaderMap = LoaderService.getSupportedLoadSpecs(provider,
550550
loader -> loader.getName().equalsIgnoreCase(program.getExecutableFormat()));
551551

552+
if (loaderMap.isEmpty()) {
553+
return null;
554+
}
555+
552556
Loader loader = loaderMap.firstKey();
553557
if (loader == null) {
554558
return null;
555559
}
560+
561+
LanguageCompilerSpecPair programLcs = program.getLanguageCompilerSpecPair();
556562
return loaderMap.get(loader)
557563
.stream()
558-
.filter(
559-
e -> e.getLanguageCompilerSpec().equals(program.getLanguageCompilerSpecPair()))
564+
.filter(e -> programLcs.equals(e.getLanguageCompilerSpec()))
560565
.findFirst()
561566
.orElse(null);
562567
}

0 commit comments

Comments
 (0)