yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

GP-955 correction

Browse source
This commit is contained in:
ghidra1 2021-05-17 14:25:33 -04:00
parent 4feb676149
commit 6bb36e5f16
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries.java
View file

@ -176,10 +176,8 @@ public class ImageRuntimeFunctionEntries {
unwindInfo.unwindCodes[i] = code; unwindInfo.unwindCodes[i] = code;
} }
// You can have an exception handler (three possible share common handler function) or you // You can have an exception handler or you can have chained exception handling info only.
// can have chained exception handling info only. if (unwindInfo.hasExceptionHandler() || unwindInfo.hasUnwindHandler()) {
if (unwindInfo.hasExceptionHandler() || unwindInfo.hasUnwindHandler() ||
unwindInfo.hasFinallyHandler()) {
unwindInfo.exceptionHandlerFunction = reader.readNextInt(); unwindInfo.exceptionHandlerFunction = reader.readNextInt();
} }
else if (unwindInfo.hasChainedUnwindInfo()) { else if (unwindInfo.hasChainedUnwindInfo()) {
@ -295,7 +293,6 @@ public class ImageRuntimeFunctionEntries {
private final static int UNW_FLAG_NHANDLER = 0x0; private final static int UNW_FLAG_NHANDLER = 0x0;
private final static int UNW_FLAG_EHANDLER = 0x1; private final static int UNW_FLAG_EHANDLER = 0x1;
private final static int UNW_FLAG_UHANDLER = 0x2; private final static int UNW_FLAG_UHANDLER = 0x2;
private final static int UNW_FLAG_FHANDLER = 0x3;
private final static int UNW_FLAG_CHAININFO = 0x4; private final static int UNW_FLAG_CHAININFO = 0x4;
private final static int UNWIND_VERSION_FIELD_LENGTH = 0x03; private final static int UNWIND_VERSION_FIELD_LENGTH = 0x03;
@ -345,7 +342,7 @@ public class ImageRuntimeFunctionEntries {
throw new AssertException(e); // should never happen with byte bit-fields throw new AssertException(e); // should never happen with byte bit-fields
} }
if (hasExceptionHandler() || hasUnwindHandler() || hasFinallyHandler()) { if (hasExceptionHandler() || hasUnwindHandler()) {
struct.add(IBO32, "ExceptionHandler", null); struct.add(IBO32, "ExceptionHandler", null);
if (hasUnwindHandler()) { if (hasUnwindHandler()) {
struct.setFlexibleArrayComponent(UnsignedLongDataType.dataType, "ExceptionData", struct.setFlexibleArrayComponent(UnsignedLongDataType.dataType, "ExceptionData",
@ -365,10 +362,6 @@ public class ImageRuntimeFunctionEntries {
return (flags & UNW_FLAG_EHANDLER) == UNW_FLAG_EHANDLER; return (flags & UNW_FLAG_EHANDLER) == UNW_FLAG_EHANDLER;
} }
public boolean hasFinallyHandler() {
return (flags & UNW_FLAG_FHANDLER) == UNW_FLAG_FHANDLER;
}
public boolean hasUnwindHandler() { public boolean hasUnwindHandler() {
return (flags & UNW_FLAG_UHANDLER) == UNW_FLAG_UHANDLER; return (flags & UNW_FLAG_UHANDLER) == UNW_FLAG_UHANDLER;
} }
@ -382,9 +375,7 @@ public class ImageRuntimeFunctionEntries {
flagsField.add("UNW_FLAG_NHANDLER", UNW_FLAG_NHANDLER); flagsField.add("UNW_FLAG_NHANDLER", UNW_FLAG_NHANDLER);
flagsField.add("UNW_FLAG_EHANDLER", UNW_FLAG_EHANDLER); flagsField.add("UNW_FLAG_EHANDLER", UNW_FLAG_EHANDLER);
flagsField.add("UNW_FLAG_UHANDLER", UNW_FLAG_UHANDLER); flagsField.add("UNW_FLAG_UHANDLER", UNW_FLAG_UHANDLER);
flagsField.add("UNW_FLAG_FHANDLER", UNW_FLAG_FHANDLER);
flagsField.add("UNW_FLAG_CHAININFO", UNW_FLAG_CHAININFO); flagsField.add("UNW_FLAG_CHAININFO", UNW_FLAG_CHAININFO);
return flagsField; return flagsField;
} }