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

Merge remote-tracking branch 'origin/GP-4326_ryanmkurtz_library' into

Browse Source 
patch (Closes #5894)
This commit is contained in:
Ryan Kurtz
2024-02-14 07:34:27 -05:00
parent ec1a3b91c5 93ed03bd63
commit d27222d9b5
1 changed files with 33 additions and 8 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
+33 -8
View File
@@ -614,8 +614,8 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
* @param log The log * @param log The log
* @param consumer A consumer object for {@link DomainObject}s generated * @param consumer A consumer object for {@link DomainObject}s generated
* @param monitor A cancelable task monitor * @param monitor A cancelable task monitor
* @return A {@link List} of newly loaded programs and libraries. Any program in the list is * @return The {@link Loaded} library, or null if it was not found. The returned library is the
* the caller's responsibility to release. * caller's responsibility to release.
* @throws IOException if there was an IO-related problem loading * @throws IOException if there was an IO-related problem loading
* @throws CancelledException if the user cancelled the load * @throws CancelledException if the user cancelled the load
*/ */
@@ -625,6 +625,7 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
LoadSpec desiredLoadSpec, List<Option> options, MessageLog log, Object consumer, LoadSpec desiredLoadSpec, List<Option> options, MessageLog log, Object consumer,
TaskMonitor monitor) throws CancelledException, IOException { TaskMonitor monitor) throws CancelledException, IOException {
libraryName = libraryName.trim();
Program library = null; Program library = null;
if (libraryDestFolderPath != null) { if (libraryDestFolderPath != null) {
String libraryPath = FilenameUtils.getPath(libraryName); String libraryPath = FilenameUtils.getPath(libraryName);
@@ -636,11 +637,11 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
} }
} }
String simpleLibraryName = FilenameUtils.getName(libraryName); String simpleLibraryName = FilenameUtils.getName(libraryName);
List<FSRL> candidateLibraryFsrls =
findLibrary(Path.of(libraryName), fsSearchPaths, log, monitor);
boolean success = false; boolean success = false;
try { try {
List<FSRL> candidateLibraryFsrls =
findLibrary(getCheckedPath(libraryName), fsSearchPaths, log, monitor);
for (FSRL candidateLibraryFsrl : candidateLibraryFsrls) { for (FSRL candidateLibraryFsrl : candidateLibraryFsrls) {
monitor.checkCancelled(); monitor.checkCancelled();
List<String> newLibraryList = new ArrayList<>(); List<String> newLibraryList = new ArrayList<>();
@@ -657,13 +658,16 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
success = true; success = true;
return new Loaded<Program>(library, simpleLibraryName, libraryDestFolderPath); return new Loaded<Program>(library, simpleLibraryName, libraryDestFolderPath);
} }
return null; }
catch (InvalidInputException e) {
log.appendMsg("Cannot load library with invalid name: \"" + libraryName + "\"");
} }
finally { finally {
if (!success && library != null) { if (!success && library != null) {
library.release(consumer); library.release(consumer);
} }
} }
return null;
} }
/** /**
@@ -1111,16 +1115,17 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
if (isLoadSystemLibraries(options) || shouldSearchAllPaths(options)) { if (isLoadSystemLibraries(options) || shouldSearchAllPaths(options)) {
List<Path> searchPaths = new ArrayList<>(); List<Path> searchPaths = new ArrayList<>();
for (String str : LibrarySearchPathManager.getLibraryPathsList()) { for (String str : LibrarySearchPathManager.getLibraryPathsList()) {
if (str.isBlank()) { str = str.trim();
if (str.isEmpty()) {
continue; continue;
} }
try { try {
Path path = Path.of(str.trim()).normalize(); Path path = getCheckedPath(str).normalize();
if (path.isAbsolute() && Files.exists(path)) { if (path.isAbsolute() && Files.exists(path)) {
searchPaths.add(path); searchPaths.add(path);
} }
} }
catch (InvalidPathException e) { catch (InvalidInputException e) {
log.appendMsg("Skipping invalid system library search path: \"" + str + "\""); log.appendMsg("Skipping invalid system library search path: \"" + str + "\"");
} }
} }
@@ -1241,4 +1246,24 @@ public abstract class AbstractLibrarySupportLoader extends AbstractProgramLoader
? String.CASE_INSENSITIVE_ORDER ? String.CASE_INSENSITIVE_ORDER
: (s1, s2) -> s1.compareTo(s2); : (s1, s2) -> s1.compareTo(s2);
} }
/**
* Calls {@link Path#of(String, String...)} with the given parameter, throwing a checked
* exception if a failure occurred.
* <p>
* NOTE: {@link Path#of(String, String...)} throws an unchecked exception, which has proven
* dangerous.
*
* @param str The string to convert to a {@link Path}
* @return The string converted to a {@link Path}
* @throws InvalidInputException if the given string cannot be converted to a {@link Path}
*/
private Path getCheckedPath(String str) throws InvalidInputException {
try {
return Path.of(str);
}
catch (InvalidPathException e) {
throw new InvalidInputException(e.getMessage());
}
}
} }