Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 06:05:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-4050: Fixed an uncaught InvalidPathException that could occur when loading libraries during import

Browse Source
This commit is contained in:
Ryan Kurtz
2023-11-17 17:02:46 -05:00
parent 522512ddd7
commit 28ca29f9e0
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractLibrarySupportLoader.java
+13 -9
View File
@@ -17,8 +17,7 @@ package ghidra.app.util.opinion;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.*;
import java.nio.file.Path;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -1059,13 +1058,18 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
List<FileSystemSearchPath> result = new ArrayList<>(); List<FileSystemSearchPath> result = new ArrayList<>();
FileSystemService fsService = FileSystemService.getInstance(); FileSystemService fsService = FileSystemService.getInstance();
if (isLoadSystemLibraries(options) || shouldSearchAllPaths(options)) { if (isLoadSystemLibraries(options) || shouldSearchAllPaths(options)) {
List<Path> searchPaths = LibrarySearchPathManager.getLibraryPathsList() List<Path> searchPaths = new ArrayList<>();
.stream() for (String str : LibrarySearchPathManager.getLibraryPathsList()) {
.map(s -> Path.of(s).normalize()) try {
.filter(Path::isAbsolute) Path path = Path.of(str).normalize();
.filter(Files::exists) if (path.isAbsolute() && Files.exists(path)) {
.toList(); searchPaths.add(path);
}
}
catch (InvalidPathException e) {
log.appendMsg("Skipping invalid system library search path: \"" + str + "\"");
}
}
for (Path searchPath : searchPaths) { for (Path searchPath : searchPaths) {
try { try {
FSRL searchFSRL = fsService.getLocalFSRL(searchPath.toFile()); FSRL searchFSRL = fsService.getLocalFSRL(searchPath.toFile());