Merge branch 'ticket21953_029'

This commit is contained in:
Nick Mathewson 2017-05-12 08:40:30 -04:00
commit 4410271446
2 changed files with 12 additions and 1 deletions

6
changes/ticket21953 Normal file
View File

@ -0,0 +1,6 @@
o Minor features:
- Enable a couple of pieces of Windows hardening: one
(HeapEnableTerminationOnCorruption) that has been on-by-default since
Windows 8, and unavailable before Windows 7, and one
(PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) which we believe doesn't
affect us, but shouldn't do any harm. Closes ticket 21953.

View File

@ -3665,6 +3665,8 @@ tor_main(int argc, char *argv[])
int result = 0;
#ifdef _WIN32
/* On heap corruption, just give up; don't try to play along. */
HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
/* Call SetProcessDEPPolicy to permanently enable DEP.
The function will not resolve on earlier versions of Windows,
and failure is not dangerous. */
@ -3673,7 +3675,10 @@ tor_main(int argc, char *argv[])
typedef BOOL (WINAPI *PSETDEP)(DWORD);
PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod,
"SetProcessDEPPolicy");
if (setdeppolicy) setdeppolicy(1); /* PROCESS_DEP_ENABLE */
if (setdeppolicy) {
/* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */
setdeppolicy(3);
}
}
#endif