Ghidra is a software reverse engineering (SRE) framework
GP-6773: Fallback loader fix for batch importer
Ryan Kurtzd70f969e8e77
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.javaindex d6d7ab44d5..f52d023cad 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LoaderService.java@@ -58,10 +58,13 @@ public class LoaderService {}}- if (loaderMap.size() <= 1) { // BinaryLoader is always there- for (Loader loader : fallback) {- tryLoadSpecs(loader, provider, loaderMap);- }+ // Only try fallback loaders if no other loaders matched (ignoring the BinaryLoader)+ boolean matches = loaderMap.keySet()+ .stream()+ .map(Loader::getName)+ .anyMatch(Predicate.not(BinaryLoader.BINARY_NAME::equals));+ if (!matches) {+ fallback.forEach(loader -> tryLoadSpecs(loader, provider, loaderMap));}return loaderMap;