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-3493_ghidra1_Elf_PT_NOTE_NPE'

Browse Source 
into patch (Closes #5384)
This commit is contained in:
Ryan Kurtz
2023-05-26 16:35:55 -04:00
parent 8e40e1111d a9f3692373
commit 9ca267892e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java
View File

@@ -15,11 +15,10 @@
*/ */
package ghidra.app.util.bin.format.elf.info; package ghidra.app.util.bin.format.elf.info;
import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.io.IOException;
import ghidra.app.util.bin.*; import ghidra.app.util.bin.*;
import ghidra.app.util.bin.format.elf.*; import ghidra.app.util.bin.format.elf.*;
import ghidra.app.util.bin.format.elf.info.ElfInfoItem.ReaderFunc; import ghidra.app.util.bin.format.elf.info.ElfInfoItem.ReaderFunc;
@@ -90,6 +89,9 @@ public class StandardElfInfoProducer implements ElfInfoProducer {
monitor.checkCancelled(); monitor.checkCancelled();
Address addr = elfLoadHelper.findLoadAddress(elfProgramHeader, 0); Address addr = elfLoadHelper.findLoadAddress(elfProgramHeader, 0);
if (addr == null) {
continue;
}
MemoryBlock memBlock = memory.getBlock(addr); MemoryBlock memBlock = memory.getBlock(addr);
if (memBlock == null) { if (memBlock == null) {
continue; continue;