github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-10 06:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-5825: Fixing issue with prior commit

Browse Source
This commit is contained in:
Ryan Kurtz
2025-08-27 10:47:13 -04:00
parent b5bfcc0fbf
commit f57b520837
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractLibrarySupportLoader.java
View File

@@ -1124,27 +1124,29 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
if (fsService.isLocal(fsrl)) {
try {
// It might be a container file that we want to look inside of, so probe
FileSystemRef fileRef =
fsService.probeFileForFilesystem(fsrl, monitor, null);
if (fileRef != null) {
result.add(new LibrarySearchPath(fileRef, null));
if (fsService.getLocalFS().getLocalFile(fsrl).isFile()) {
FileSystemRef fileRef =
fsService.probeFileForFilesystem(fsrl, monitor, null);
if (fileRef != null) {
result.add(new LibrarySearchPath(fileRef, null));
continue;
}
}
}
catch (IOException e) {
log.appendMsg(e.getMessage());
}
}
else {
try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
if (fileRef != null) {
result.add(
new LibrarySearchPath(fileRef.fsRef.dup(), fileRef.file.getPath()));
}
}
catch (IOException e) {
log.appendMsg(e.getMessage());
try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
if (fileRef != null) {
result.add(
new LibrarySearchPath(fileRef.fsRef.dup(), fileRef.file.getPath()));
}
}
catch (IOException e) {
log.appendMsg(e.getMessage());
}
}
success = true;
}