- tor-commits - lists.torproject.org

[tor/master] Robert says that this bug was not in fact one of frosty's
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 8ba1cf3007fccafa764e8f96e346354dca45f2ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:54:54 2011 -0500 Robert says that this bug was not in fact one of frosty's --- changes/bug4424 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 index 6928745..443625d 100644 --- a/changes/bug4424 +++ b/changes/bug4424 @@ -2,5 +2,5 @@ - Don't leak memory when we check whether a hidden service descriptor has any usable introduction points left. Fixes bug - 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + 4424. Bugfix on 0.2.2.25-alpha.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 25875f533b1798ef4e131124ed76a97b77f368c6 Merge: ceebc82 8ba1cf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:55:11 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4424 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug4411'
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 4a7225d4c97b956f6fe6b7d806c3a29b91d26c35 Merge: 25875f5 749b37b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:57:07 2011 -0500 Merge remote-tracking branch 'rransom-tor/bug4411' changes/bug4411 | 10 ++++++++++ src/or/rendclient.c | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Robert says that this bug was not in fact one of frosty's
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 8ba1cf3007fccafa764e8f96e346354dca45f2ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:54:54 2011 -0500 Robert says that this bug was not in fact one of frosty's --- changes/bug4424 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 index 6928745..443625d 100644 --- a/changes/bug4424 +++ b/changes/bug4424 @@ -2,5 +2,5 @@ - Don't leak memory when we check whether a hidden service descriptor has any usable introduction points left. Fixes bug - 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + 4424. Bugfix on 0.2.2.25-alpha.

1 0

[tor/master] Don't leak an extend_info_t in rend_client_any_intro_points_usable
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 65a0d7e7ef03cc2390cad81264e451e59206842b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Nov 7 08:35:51 2011 -0800 Don't leak an extend_info_t in rend_client_any_intro_points_usable --- changes/bug4424 | 6 ++++++ src/or/rendclient.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 new file mode 100644 index 0000000..6928745 --- /dev/null +++ b/changes/bug4424 @@ -0,0 +1,6 @@ + o Major bugfixes + + - Don't leak memory when we check whether a hidden service + descriptor has any usable introduction points left. Fixes bug + 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index f84475a..3dfca58 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -952,8 +952,14 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, int rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { - return rend_client_get_random_intro_impl( - entry, get_options()->StrictNodes, 0) != NULL; + extend_info_t *extend_info = + rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); + int rv = extend_info != NULL; + + if (extend_info != NULL) + extend_info_free(extend_info); + + return rv; } /** Client-side authorizations for hidden services; map of onion address to

1 0

[tor/master] Remove an extraneous "if" in the 4424 fix
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 02d89c5c663ec5370386de0173accaa66c1e69f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:46:51 2011 -0500 Remove an extraneous "if" in the 4424 fix --- src/or/rendclient.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3dfca58..f951dad 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -954,11 +954,10 @@ rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { extend_info_t *extend_info = rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); - int rv = extend_info != NULL; - if (extend_info != NULL) - extend_info_free(extend_info); + int rv = (extend_info != NULL); + extend_info_free(extend_info); return rv; }

1 0

[tor/master] Merge branch 'bug4424' into maint-0.2.2
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit ca282e53263de564774944a8aa93e88271983461 Merge: 4d8306e 02d89c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:47:28 2011 -0500 Merge branch 'bug4424' into maint-0.2.2 changes/bug4424 | 6 ++++++ src/or/rendclient.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit ceebc8283f4ba8fbc19c0b788d855855f5bbdbb8 Merge: 21dd6ea ca282e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:48:02 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4424 | 6 ++++++ src/or/rendclient.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Don't leak an extend_info_t in rend_client_any_intro_points_usable
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 65a0d7e7ef03cc2390cad81264e451e59206842b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Nov 7 08:35:51 2011 -0800 Don't leak an extend_info_t in rend_client_any_intro_points_usable --- changes/bug4424 | 6 ++++++ src/or/rendclient.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/changes/bug4424 b/changes/bug4424 new file mode 100644 index 0000000..6928745 --- /dev/null +++ b/changes/bug4424 @@ -0,0 +1,6 @@ + o Major bugfixes + + - Don't leak memory when we check whether a hidden service + descriptor has any usable introduction points left. Fixes bug + 4424. Bugfix on 0.2.2.25-alpha; found by frosty_un. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index f84475a..3dfca58 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -952,8 +952,14 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, int rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { - return rend_client_get_random_intro_impl( - entry, get_options()->StrictNodes, 0) != NULL; + extend_info_t *extend_info = + rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); + int rv = extend_info != NULL; + + if (extend_info != NULL) + extend_info_free(extend_info); + + return rv; } /** Client-side authorizations for hidden services; map of onion address to

1 0

[tor/maint-0.2.2] Remove an extraneous "if" in the 4424 fix
by nickm＠torproject.org 07 Nov '11

07 Nov '11

commit 02d89c5c663ec5370386de0173accaa66c1e69f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 7 11:46:51 2011 -0500 Remove an extraneous "if" in the 4424 fix --- src/or/rendclient.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3dfca58..f951dad 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -954,11 +954,10 @@ rend_client_any_intro_points_usable(const rend_cache_entry_t *entry) { extend_info_t *extend_info = rend_client_get_random_intro_impl(entry, get_options()->StrictNodes, 0); - int rv = extend_info != NULL; - if (extend_info != NULL) - extend_info_free(extend_info); + int rv = (extend_info != NULL); + extend_info_free(extend_info); return rv; }

1 0