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

Merge remote-tracking branch 'origin/GP-0_dev747368_more_fixes_dwarf_external_program_addresses' into Ghidra_12.0

Browse Source
This commit is contained in:
Ryan Kurtz
2025-11-24 13:41:29 -05:00
parent 97881c199d 1d86eaf745
commit 5fd013d0ea
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/MemoryByteProvider.java
View File

@@ -159,6 +159,10 @@ public class MemoryByteProvider implements ByteProvider {
this.isEmtpy = maxAddress == null;
}
public Memory getMemory() {
return memory;
}
private Address getAddress(long index) throws IOException {
if (index == 0) {
return baseAddress;

5
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFProgram.java
View File

@@ -573,7 +573,10 @@ public class DWARFProgram implements Closeable {
}
ByteProvider bp = br.getByteProvider();
if (bp instanceof MemoryByteProvider mbp && !mbp.isEmpty()) {
if (program.getRelocationTable().getRelocations(mbp.getAddressSet()).hasNext()) {
Program providerProgram = mbp.getMemory().getProgram();
if (providerProgram.getRelocationTable()
.getRelocations(mbp.getAddressSet())
.hasNext()) {
return true;
}
}