GP-4563: Fix for container file search paths

NationalSecurityAgency · May 23, 2024 · ab97ddb · ab97ddb
1 parent 99fa206
commit ab97ddb
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractLibrarySupportLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractLibrarySupportLoader.java
@@ -1122,12 +1122,28 @@ private List<FileSystemSearchPath> getSystemLibrarySearchPaths(List<Option> opti
 		boolean success = false;
 		try {
 			for (FSRL fsrl : LibrarySearchPathManager.getLibraryFsrlList(log, monitor)) {
-				try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
-					File f = new File(fileRef.file.getPath()); // File API will sanitize Windows-style paths
-					result.add(new FileSystemSearchPath(fileRef.fsRef.dup(), f.toPath()));
+				if (fsService.isLocal(fsrl)) {
+					try {
+						FileSystemRef fileRef =
+							fsService.probeFileForFilesystem(fsrl, monitor, null);
+						if (fileRef != null) {
+							result.add(new FileSystemSearchPath(fileRef, null));
+						}
+					}
+					catch (IOException e) {
+						log.appendMsg(e.getMessage());
+					}
 				}
-				catch (IOException e) {
-					log.appendMsg(e.getMessage());
+				else {
+					try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
+						if (fileRef != null) {
+							File f = new File(fileRef.file.getPath()); // File API will sanitize Windows-style paths
+							result.add(new FileSystemSearchPath(fileRef.fsRef.dup(), f.toPath()));
+						}
+					}
+					catch (IOException e) {
+						log.appendMsg(e.getMessage());
+					}
 				}
 			}
 			success = true;