Skip to content

Commit 0aa317f

Browse files
committed
Merge remote-tracking branch 'origin/GP-4260_ryanmkurtz_mz'
(Closes NationalSecurityAgency#6029)
2 parents d92932a + 2dc7a8f commit 0aa317f

File tree

1 file changed

+5
-0
lines changed
  • Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion

1 file changed

+5
-0
lines changed

Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MzLoader.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ private void processMemoryBlocks(Program program, FileBytes fileBytes,
188188
}
189189
// Allocate an initialized memory block for each segment we know about
190190
int endOffset = pagesToBytes(header.e_cp() - 1) + header.e_cblp();
191+
if (endOffset > reader.length()) {
192+
log.appendMsg(
193+
"File is 0x%x bytes but header reports 0x%x".formatted(reader.length(), endOffset));
194+
endOffset = (int) reader.length();
195+
}
191196
MemoryBlock lastBlock = null;
192197
List<SegmentedAddress> orderedSegments = new ArrayList<>(knownSegments);
193198
for (int i = 0; i < orderedSegments.size(); i++) {

0 commit comments

Comments
 (0)