diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 06:49:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 06:49:04 -0400 |
| commit | d34fa32ece2179c18f8aeae0026d2b452956842f (patch) | |
| tree | b12730f3e8b6884db18060704299b7123199aa49 | |
| parent | 553cd7f0c5a45c0afdd6badb5170a59bf4ab3c71 (diff) | |
| parent | 15cc41e6649009ccd92d927850f918b962ee35d6 (diff) | |
| download | tor-d34fa32ece2179c18f8aeae0026d2b452956842f.tar.gz tor-d34fa32ece2179c18f8aeae0026d2b452956842f.zip | |
Merge branch 'ticket21953_029'
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 670535b5d5..398c4f63d2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3667,6 +3667,9 @@ tor_main(int argc, char *argv[]) int result = 0; #ifdef _WIN32 +#ifndef HeapEnableTerminationOnCorruption +#define HeapEnableTerminationOnCorruption 1 +#endif /* On heap corruption, just give up; don't try to play along. */ HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); /* Call SetProcessDEPPolicy to permanently enable DEP. |