Merge remote-tracking branch 'origin/patch'

ryanmkurtz · ryanmkurtz · commit 0795a6e80836 · 2019-11-21T11:44:06.000-05:00
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
@@ -612,7 +612,7 @@ private Map<SectionHeader, Address> processMemoryBlocks(PortableExecutable pe, P
 		}
 
 		// Header block
-		int virtualSize = getVirtualSize(pe, sections, space);
+		int virtualSize = (int) Math.min(getVirtualSize(pe, sections, space), fileBytes.getSize());
 		long addr = optionalHeader.getImageBase();
 		Address address = space.getAddress(addr);
 

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ private Map<SectionHeader, Address> processMemoryBlocks(PortableExecutable pe, P`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`// Header block`
`615`		`- int virtualSize = getVirtualSize(pe, sections, space);`
	`615`	`+ int virtualSize = (int) Math.min(getVirtualSize(pe, sections, space), fileBytes.getSize());`
`616`	`616`	`long addr = optionalHeader.getImageBase();`
`617`	`617`	`Address address = space.getAddress(addr);`
`618`	`618`