tor

commit d2105ff5d530544538f6e98c1fba4d117223d12d
parent 57b207efa42e0a2794457cc7aff9c662d9000b44
Author: teor <teor@torproject.org>
Date:   Fri,  7 Sep 2018 13:00:34 +1000

Merge branch 'bug27461-029' into bug27461-032

Fix a minor merge conflict due to an #endif comment.

Diffstat:
A
changes/bug27461
 | 
5
+++++
M
src/or/main.c
 | 
8
++++++++

2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/changes/bug27461 b/changes/bug27461
@@ -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.
diff --git a/src/or/main.c b/src/or/main.c
@@ -3719,6 +3719,13 @@ tor_main(int argc, char *argv[])
 #endif
   /* On heap corruption, just give up; don't try to play along. */
   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.
      The function will not resolve on earlier versions of Windows,
      and failure is not dangerous. */
@@ -3732,6 +3739,7 @@ tor_main(int argc, char *argv[])
       setdeppolicy(3);
     }
   }
+#endif /* !defined(_WIN64) */
 #endif /* defined(_WIN32) */
 
   configure_backtrace_handler(get_version());