mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_dev747368_fix_ESR_npe_when_import_and_no_project'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-02-09 12:18:09 -05:00
parent 247528c7fe 645a7c0d52
commit d8dae6d092
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfLoader.java
View File

@@ -23,8 +23,7 @@ import ghidra.app.util.bin.ByteProvider;
import ghidra.app.util.bin.format.elf.ElfException;
import ghidra.app.util.bin.format.elf.ElfHeader;
import ghidra.app.util.importer.MessageLog;
import ghidra.framework.model.DomainObject;
import ghidra.framework.model.Project;
import ghidra.framework.model.*;
import ghidra.framework.options.Options;
import ghidra.program.model.lang.Endian;
import ghidra.program.model.listing.Program;
@@ -158,8 +157,8 @@ public class ElfLoader extends AbstractLibrarySupportLoader {
throws CancelledException, IOException {
super.postLoadProgramFixups(loadedPrograms, project, options, messageLog, monitor);
try (ExternalSymbolResolver esr =
new ExternalSymbolResolver(project.getProjectData(), monitor)) {
ProjectData projectData = project != null ? project.getProjectData() : null;
try (ExternalSymbolResolver esr = new ExternalSymbolResolver(projectData, monitor)) {
for (Loaded<Program> loadedProgram : loadedPrograms) {
esr.addProgramToFixup(
loadedProgram.getProjectFolderPath() + loadedProgram.getName(),

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

@@ -160,7 +160,7 @@ public class ExternalSymbolResolver implements Closeable {
*/
protected Program getLibraryProgram(String libPath) throws CancelledException {
Program result = loadedPrograms.get(libPath);
if (result == null && !problemLibraries.containsKey(libPath)) {
if (result == null && projectData != null && !problemLibraries.containsKey(libPath)) {
result = openLibraryFile(projectData.getFile(libPath), libPath);
if (result != null) {