Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-26 22:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4215_ryanmkurtz_pe-magic' into

Browse Source 
patch (Closes #6093)
This commit is contained in:
Ryan Kurtz 2024-01-09 11:23:52 -05:00
commit 50b76b2e4b
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/OptionalHeaderImpl.java
View File

@ -28,7 +28,6 @@ import ghidra.program.model.mem.Memory;
import ghidra.program.model.mem.MemoryAccessException;
import ghidra.util.*;
import ghidra.util.exception.DuplicateNameException;
import ghidra.util.exception.NotYetImplementedException;
import ghidra.util.task.TaskMonitor;
/**
@ -157,21 +156,7 @@ public class OptionalHeaderImpl implements OptionalHeader {
@Override
public boolean is64bit() {
switch (magic) {
case Constants.IMAGE_NT_OPTIONAL_HDR32_MAGIC:
return false;
case Constants.IMAGE_NT_OPTIONAL_HDR64_MAGIC:
return true;
}
int characteristics = ntHeader.getFileHeader().getCharacteristics();
if ((characteristics & FileHeader.IMAGE_FILE_DLL) == FileHeader.IMAGE_FILE_DLL &&
(characteristics & FileHeader.IMAGE_FILE_EXECUTABLE_IMAGE) == 0) {
Msg.warn(this, "Invalid magic " + magic + " but potentially data-only DLL");
return false;
}
throw new NotYetImplementedException(
"Optional header of type [" + Integer.toHexString(magic) + "] is not supported");
return magic == Constants.IMAGE_NT_OPTIONAL_HDR64_MAGIC;
}
@Override
@ -486,6 +471,11 @@ public class OptionalHeaderImpl implements OptionalHeader {
reader.setPointerIndex(startIndex);
magic = reader.readNextShort();
if (magic != Constants.IMAGE_ROM_OPTIONAL_HDR_MAGIC &&
magic != Constants.IMAGE_NT_OPTIONAL_HDR32_MAGIC &&
magic != Constants.IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
Msg.warn(this, "Unsupported magic value: 0x%x. Assuming 32-bit.".formatted(magic));
}
majorLinkerVersion = reader.readNextByte();
minorLinkerVersion = reader.readNextByte();
sizeOfCode = reader.readNextInt();