Merge remote-tracking branch 'origin/GP-3493_ghidra1_Elf_PT_NOTE_NPE'

into patch (Closes #5384)
This commit is contained in:
Ryan Kurtz 2023-05-26 16:35:55 -04:00
commit 9ca267892e

View file

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