December 2015 - tor-commits - lists.torproject.org

[tor/maint-0.2.5] Fix a compilation warning introduced by clang 3.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Fix a compilation warning introduced by clang 3.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b53ff8606714c2f94d251a40c1a073bca760495e Merge: 089ee13 4328525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:25 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit eeb9751eadd148e5077cedb28f75e756b47281c0 Merge: e9bf584 b53ff86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:42 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] Fix a compilation warning introduced by clang 3.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b53ff8606714c2f94d251a40c1a073bca760495e Merge: 089ee13 4328525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:25 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit eeb9751eadd148e5077cedb28f75e756b47281c0 Merge: e9bf584 b53ff86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:42 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0