Merge remote-tracking branch 'origin/patch'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/PeLoader.java
This commit is contained in:
Ryan Kurtz
2022-12-15 05:40:55 -05:00
@@ -683,7 +683,7 @@ public class PeLoader extends AbstractPeDebugLoader {
if (dataSize > 0) {
MemoryBlockUtils.createUninitializedBlock(prog, false, sectionName, address,
dataSize, "", "", r, w, x, log);
sectionToAddress.put(sections[i], address);
sectionToAddress.putIfAbsent(sections[i], address);
}
}