May 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 May '20

06 May '20

commit bbfc498e21c9854b16b0543bf3f3f4ac304711f7 Merge: 2d34d4d1a a02e86664 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'bug34077_043' into maint-0.4.3
by nickm＠torproject.org 06 May '20

06 May '20

commit 711385c47f93230aad049b2b7952d391a9114f68 Merge: 42507429c b1c383e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:45 2020 -0400 Merge branch 'bug34077_043' into maint-0.4.3 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 06 May '20

06 May '20

commit b762f168bf811a15a0317246af609c8d3372dd5c Merge: a56d990fc e61867416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 May '20

06 May '20

commit bbfc498e21c9854b16b0543bf3f3f4ac304711f7 Merge: 2d34d4d1a a02e86664 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 06 May '20

06 May '20

commit e61867416ec23b996de4c6a8c1c6875db549faf2 Merge: 711385c47 bbfc498e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/maint-0.4.1] Fix a GCC 10.0.1 compilation warning.
by nickm＠torproject.org 06 May '20

06 May '20

commit d7e166bd95411d3f5caa573e0293356bff78c481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:56:31 2020 -0400 Fix a GCC 10.0.1 compilation warning. Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56) --- changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug34077 b/changes/bug34077 new file mode 100644 index 000000000..29458bd9d --- /dev/null +++ b/changes/bug34077 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on + 0.4.0.3-alpha. diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index b669e3836..58c203e20 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after) sr_phase_t sr_state_get_phase(void) { - void *ptr; + void *ptr=NULL; state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr); + tor_assert(ptr); return *(sr_phase_t *) ptr; }

1 0

[tor/maint-0.4.1] Merge branch 'bug34077_041' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit a02e866642c28b4c0cbe415f8573c4ede4d9caf7 Merge: 987f2fa50 d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:14:38 2020 -0400 Merge branch 'bug34077_041' into maint-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Fix a GCC 10.0.1 compilation warning.
by nickm＠torproject.org 06 May '20

06 May '20

commit d7e166bd95411d3f5caa573e0293356bff78c481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:56:31 2020 -0400 Fix a GCC 10.0.1 compilation warning. Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56) --- changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug34077 b/changes/bug34077 new file mode 100644 index 000000000..29458bd9d --- /dev/null +++ b/changes/bug34077 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on + 0.4.0.3-alpha. diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index b669e3836..58c203e20 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after) sr_phase_t sr_state_get_phase(void) { - void *ptr; + void *ptr=NULL; state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr); + tor_assert(ptr); return *(sr_phase_t *) ptr; }

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 May '20

06 May '20

commit bbfc498e21c9854b16b0543bf3f3f4ac304711f7 Merge: 2d34d4d1a a02e86664 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge branch 'bug34077_041' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit a02e866642c28b4c0cbe415f8573c4ede4d9caf7 Merge: 987f2fa50 d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:14:38 2020 -0400 Merge branch 'bug34077_041' into maint-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0