mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-22 16:50:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-1 Correct GP-6643 regression with resolving ELF external symbols to

Browse Source 
libraries
This commit is contained in:
ghidra1
2026-09-17 13:24:53 -04:00
parent ad0f0231d6
commit fbe86aacaa
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Ghidra/Features/Base/src/main/java/ghidra/program/util/ExternalSymbolResolver.java
View File

@@ -212,6 +212,9 @@ public class ExternalSymbolResolver implements Closeable {
logger.accept("\t%d external symbols resolved, %d remain unresolved"
.formatted(getResolvedSymbolCount(), unresolvedExternalFunctionIds.size()));
for (ExtLibInfo extLib : extLibs) {
if (Library.UNKNOWN.equals(extLib.getName())) {
continue;
}
String libPath = extLib.getAssociatedProgramPath();
String loggedLibPath = libPath != null ? libPath : "missing";
if (extLib.problem != null) {
@@ -269,7 +272,9 @@ public class ExternalSymbolResolver implements Closeable {
try (Transaction tx = program.openTransaction("Resolve External Symbols")) {
for (ExtLibInfo extLib : extLibs) {
monitor.checkCancelled();
resolveSymbolsToLibrary(extLib);
if (extLib.libProgram != null) {
resolveSymbolsToLibrary(extLib);
}
}
}
}
@@ -292,7 +297,7 @@ public class ExternalSymbolResolver implements Closeable {
Program libProg = libPath != null ? getLibraryProgram(libPath) : null;
Throwable problem =
libProg == null && libPath != null ? problemLibraries.get(libPath) : null;
result.add(new ExtLibInfo(lib, problem));
result.add(new ExtLibInfo(lib, libProg, problem));
}
return result;
}
@@ -322,7 +327,7 @@ public class ExternalSymbolResolver implements Closeable {
ExternalLocation extLoc = externalManager.getExternalLocation(s);
String extLocName =
Objects.requireNonNullElse(extLoc.getOriginalImportedName(), extLoc.getLabel());
if (isExportedSymbol(program, extLocName)) {
if (isExportedSymbol(extLib.libProgram, extLocName)) {
try {
s.setNamespace(extLib.lib);
idIterator.remove();
@@ -360,6 +365,7 @@ public class ExternalSymbolResolver implements Closeable {
private class ExtLibInfo {
final Library lib;
final Program libProgram; // may be null
final List<String> resolvedSymbols = new ArrayList<>();
final Throwable problem;
@@ -367,13 +373,15 @@ public class ExternalSymbolResolver implements Closeable {
* Define external Library dependency associated with {@link ProgramSymbolResolver}
* instance.
* @param lib external library dependency
* @param problem exception which occured while accessing Library
* @param libProgram imported or discovered program which corresponds to lib, or null if not found
* @param problem exception which occurred while accessing Library
*/
ExtLibInfo(Library lib, Throwable problem) {
ExtLibInfo(Library lib, Program libProgram, Throwable problem) {
if (program != lib.getSymbol().getProgram()) {
throw new AssertionError("Program mismatch");
}
this.lib = lib;
this.libProgram = libProgram;
this.problem = problem;
}
@@ -416,7 +424,9 @@ public class ExternalSymbolResolver implements Closeable {
* @return true if program publishes a symbol the specified name
*/
private static boolean isExportedSymbol(Program program, String name) {
if (program == null) {
return false;
}
for (Symbol s : program.getSymbolTable().getLabelOrFunctionSymbols(name, null)) {
if (s.isExternalEntryPoint()) {
return true;