nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-07 08:46:45 -04:00
commit 056003d602
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug27461 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (compilation):
- Stop calling SetProcessDEPPolicy() on 64-bit Windows. It is not
supported, and always fails. Some compilers warn about the function
pointer cast on 64-bit Windows.
Fixes bug 27461; bugfix on 0.2.2.23-alpha.

8
src/or/main.c
View File

@ -3995,6 +3995,13 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
#endif #endif
/* On heap corruption, just give up; don't try to play along. */ /* On heap corruption, just give up; don't try to play along. */
HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
/* SetProcessDEPPolicy is only supported on 32-bit Windows.
* (On 64-bit Windows it always fails, and some compilers don't like the
* PSETDEP cast.)
* 32-bit Windows defines _WIN32.
* 64-bit Windows defines _WIN32 and _WIN64. */
#ifndef _WIN64
/* Call SetProcessDEPPolicy to permanently enable DEP. /* Call SetProcessDEPPolicy to permanently enable DEP.
The function will not resolve on earlier versions of Windows, The function will not resolve on earlier versions of Windows,
and failure is not dangerous. */ and failure is not dangerous. */
@ -4008,6 +4015,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
setdeppolicy(3); setdeppolicy(3);
} }
} }
#endif /* !defined(_WIN64) */
#endif /* defined(_WIN32) */ #endif /* defined(_WIN32) */
configure_backtrace_handler(get_version()); configure_backtrace_handler(get_version());