From dba70df2affbdfe1855b66cb7fa1fc4dcfde85e7 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Wed, 14 Dec 2022 13:43:40 -0500 Subject: [PATCH] GP-2948: PeLoader uninitialized padding block start addresses no longer overwrite true section start address (Closes #4815) --- .../Base/src/main/java/ghidra/app/util/opinion/PeLoader.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java index 6eb905a38d..60b934406c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java @@ -16,7 +16,6 @@ package ghidra.app.util.opinion; import java.io.IOException; -import java.math.BigInteger; import java.util.*; import ghidra.app.util.MemoryBlockUtils; @@ -36,8 +35,6 @@ import ghidra.program.database.function.OverlappingFunctionException; import ghidra.program.database.mem.FileBytes; import ghidra.program.model.address.*; import ghidra.program.model.data.*; -import ghidra.program.model.lang.Register; -import ghidra.program.model.lang.RegisterValue; import ghidra.program.model.listing.*; import ghidra.program.model.mem.Memory; import ghidra.program.model.mem.MemoryAccessException; @@ -742,7 +739,7 @@ public class PeLoader extends AbstractPeDebugLoader { if (dataSize > 0) { MemoryBlockUtils.createUninitializedBlock(prog, false, sections[i].getReadableName(), address, dataSize, "", "", r, w, x, log); - sectionToAddress.put(sections[i], address); + sectionToAddress.putIfAbsent(sections[i], address); } }