Merge remote-tracking branch 'origin/GP-4927_ryanmkurtz_ne' into

Ghidra_11.2 (Closes #6889)
This commit is contained in:
Ryan Kurtz 2024-09-13 13:07:32 -04:00
commit e03118aa92

View File

@ -350,8 +350,15 @@ public class NeLoader extends AbstractOrdinalSupportLoader {
Address addr = space.getAddress(segidx, 0);
try {
int offset = resource.getFileOffsetShifted();
int length = resource.getFileLengthShifted();
long offset = Integer.toUnsignedLong(resource.getFileOffsetShifted());
long length = Integer.toUnsignedLong(resource.getFileLengthShifted());
long extra = offset + length - fileBytes.getSize();
if (extra > 0) {
log.appendMsg(
"Resource at 0x%x exceeds file length by 0x%x bytes...truncating"
.formatted(offset, extra));
length -= extra;
}
if (length > 0) {
MemoryBlockUtils.createInitializedBlock(program, false, "Rsrc" + (id++),
addr, fileBytes, offset, length, "", "", true, false, false, log);