yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-5825: Fixing regression with loading libraries from container file

Browse source
This commit is contained in:
Ryan Kurtz 2025-08-27 06:00:56 -04:00
parent fc1c06ea39
commit b5bfcc0fbf
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractLibrarySupportLoader.java
View file

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