mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 17:59:46 +02:00
GP-5825: Fixing issue with prior commit
This commit is contained in:
parent
b5bfcc0fbf
commit
f57b520837
1 changed files with 15 additions and 13 deletions
|
@ -1124,17 +1124,20 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
|
||||||
if (fsService.isLocal(fsrl)) {
|
if (fsService.isLocal(fsrl)) {
|
||||||
try {
|
try {
|
||||||
// It might be a container file that we want to look inside of, so probe
|
// It might be a container file that we want to look inside of, so probe
|
||||||
|
if (fsService.getLocalFS().getLocalFile(fsrl).isFile()) {
|
||||||
FileSystemRef fileRef =
|
FileSystemRef fileRef =
|
||||||
fsService.probeFileForFilesystem(fsrl, monitor, null);
|
fsService.probeFileForFilesystem(fsrl, monitor, null);
|
||||||
if (fileRef != null) {
|
if (fileRef != null) {
|
||||||
result.add(new LibrarySearchPath(fileRef, null));
|
result.add(new LibrarySearchPath(fileRef, null));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (IOException e) {
|
catch (IOException e) {
|
||||||
log.appendMsg(e.getMessage());
|
log.appendMsg(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
|
try (RefdFile fileRef = fsService.getRefdFile(fsrl, monitor)) {
|
||||||
if (fileRef != null) {
|
if (fileRef != null) {
|
||||||
result.add(
|
result.add(
|
||||||
|
@ -1145,7 +1148,6 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
|
||||||
log.appendMsg(e.getMessage());
|
log.appendMsg(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
success = true;
|
success = true;
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue