September 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Merge branch 'bug27461-029' into bug27461-032
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit d2105ff5d530544538f6e98c1fba4d117223d12d Merge: 57b207efa 8ef4bb7f3 Author: teor <teor(a)torproject.org> Date: Fri Sep 7 13:00:34 2018 +1000 Merge branch 'bug27461-029' into bug27461-032 Fix a minor merge conflict due to an #endif comment. changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --cc src/or/main.c index 66b592098,55bcb18c4..6c32ee5d8 --- a/src/or/main.c +++ b/src/or/main.c @@@ -3732,7 -3453,8 +3739,8 @@@ tor_main(int argc, char *argv[] setdeppolicy(3); } } + #endif /* !defined(_WIN64) */ -#endif +#endif /* defined(_WIN32) */ configure_backtrace_handler(get_version());

1 0

[tor/release-0.3.4] Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 8ef4bb7f3ee5e61c1a48ce7247fbe6fad773a8d4 Author: teor <teor(a)torproject.org> Date: Fri Sep 7 12:58:11 2018 +1000 Windows: 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. --- changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug27461 b/changes/bug27461 new file mode 100644 index 000000000..3571ee816 --- /dev/null +++ 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 index fcd8dc902..55bcb18c4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3433,6 +3433,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. */ @@ -3446,6 +3453,7 @@ tor_main(int argc, char *argv[]) setdeppolicy(3); } } +#endif /* !defined(_WIN64) */ #endif configure_backtrace_handler(get_version());

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 9fcb3ef787285fcb116d07fc2ff563e80a0c8a0e Merge: 912ae2b8d 8ef4bb7f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:46:35 2018 -0400 Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/maint-0.3.2] Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 8ef4bb7f3ee5e61c1a48ce7247fbe6fad773a8d4 Author: teor <teor(a)torproject.org> Date: Fri Sep 7 12:58:11 2018 +1000 Windows: 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. --- changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug27461 b/changes/bug27461 new file mode 100644 index 000000000..3571ee816 --- /dev/null +++ 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 index fcd8dc902..55bcb18c4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3433,6 +3433,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. */ @@ -3446,6 +3453,7 @@ tor_main(int argc, char *argv[]) setdeppolicy(3); } } +#endif /* !defined(_WIN64) */ #endif configure_backtrace_handler(get_version());

1 0

[tor/maint-0.3.2] Merge branch 'bug27461-029' into bug27461-032
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit d2105ff5d530544538f6e98c1fba4d117223d12d Merge: 57b207efa 8ef4bb7f3 Author: teor <teor(a)torproject.org> Date: Fri Sep 7 13:00:34 2018 +1000 Merge branch 'bug27461-029' into bug27461-032 Fix a minor merge conflict due to an #endif comment. changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --cc src/or/main.c index 66b592098,55bcb18c4..6c32ee5d8 --- a/src/or/main.c +++ b/src/or/main.c @@@ -3732,7 -3453,8 +3739,8 @@@ tor_main(int argc, char *argv[] setdeppolicy(3); } } + #endif /* !defined(_WIN64) */ -#endif +#endif /* defined(_WIN32) */ configure_backtrace_handler(get_version());

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 9fcb3ef787285fcb116d07fc2ff563e80a0c8a0e Merge: 912ae2b8d 8ef4bb7f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:46:35 2018 -0400 Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'bug27461-029' into bug27461-032
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit d2105ff5d530544538f6e98c1fba4d117223d12d Merge: 57b207efa 8ef4bb7f3 Author: teor <teor(a)torproject.org> Date: Fri Sep 7 13:00:34 2018 +1000 Merge branch 'bug27461-029' into bug27461-032 Fix a minor merge conflict due to an #endif comment. changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --cc src/or/main.c index 66b592098,55bcb18c4..6c32ee5d8 --- a/src/or/main.c +++ b/src/or/main.c @@@ -3732,7 -3453,8 +3739,8 @@@ tor_main(int argc, char *argv[] setdeppolicy(3); } } + #endif /* !defined(_WIN64) */ -#endif +#endif /* defined(_WIN32) */ configure_backtrace_handler(get_version());

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 9fcb3ef787285fcb116d07fc2ff563e80a0c8a0e Merge: 912ae2b8d 8ef4bb7f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:46:35 2018 -0400 Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 987e12a58f6ce9e0001413e665ac2aa92869af77 Merge: eacaff6cc 9fcb3ef78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit eacaff6ccc8ea25859a1a9e14795bd4d4eac360f Merge: a5ed62f96 d2105ff5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:46:41 2018 -0400 Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2 changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0