bool hasSafeSEH() { return feat00Flags & 0x1; }
// True if this file was compiled with /guard:cf.
- bool hasGuardCF() { return feat00Flags & 0x4800; }
+ bool hasGuardCF() { return feat00Flags & 0x800; }
+
+ // True if this file was compiled with /guard:ehcont.
+ bool hasGuardEHCont() { return feat00Flags & 0x4000; }
// Pointer to the PDB module descriptor builder. Various debug info records
// will reference object files by "module index", which is here. Things like
SymbolRVASet ehContTargets;
for (ObjFile *file : ctx.objFileInstances) {
// If the object was compiled with /guard:cf, the address taken symbols
- // are in .gfids$y sections, the longjmp targets are in .gljmp$y sections,
- // and ehcont targets are in .gehcont$y sections. If the object was not
- // compiled with /guard:cf, we assume there were no setjmp and ehcont
- // targets, and that all code symbols with relocations are possibly
- // address-taken.
+ // are in .gfids$y sections, and the longjmp targets are in .gljmp$y
+ // sections. If the object was not compiled with /guard:cf, we assume there
+ // were no setjmp targets, and that all code symbols with relocations are
+ // possibly address-taken.
if (file->hasGuardCF()) {
markSymbolsForRVATable(file, file->getGuardFidChunks(), addressTakenSyms);
markSymbolsForRVATable(file, file->getGuardIATChunks(), giatsRVASet);
getSymbolsFromSections(file, file->getGuardIATChunks(), giatsSymbols);
markSymbolsForRVATable(file, file->getGuardLJmpChunks(), longJmpTargets);
- markSymbolsForRVATable(file, file->getGuardEHContChunks(), ehContTargets);
} else {
markSymbolsWithRelocations(file, addressTakenSyms);
}
+ // If the object was compiled with /guard:ehcont, the ehcont targets are in
+ // .gehcont$y sections.
+ if (file->hasGuardEHCont())
+ markSymbolsForRVATable(file, file->getGuardEHContChunks(), ehContTargets);
}
// Mark the image entry as address-taken.
# CHECK: GuardCFCheckFunction: 0x0
# CHECK: GuardCFCheckDispatch: 0x0
# CHECK: GuardCFFunctionTable: 0x14000{{.*}}
-# CHECK: GuardCFFunctionCount: 1
+# CHECK: GuardCFFunctionCount: 4
# CHECK: GuardFlags [ (0x400500)
# CHECK: CF_FUNCTION_TABLE_PRESENT (0x400)
# CHECK: CF_INSTRUMENTED (0x100)
.fill 72, 1, 0
.quad __guard_eh_cont_table
.quad __guard_eh_cont_count
- .fill 32, 1, 0
\ No newline at end of file
+ .fill 32, 1, 0