August 2016 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug19466'
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit fdc2a9195686805e98e221150fa476afe2d394e9 Merge: 8f2f06c be820f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:37:48 2016 -0400 Merge remote-tracking branch 'public/bug19466' changes/bug19466 | 3 +++ src/or/config.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/master] Fix quite a few slow memory leaks in config.c
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit be820f41a33413883b23220ec19135477ac3e67d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 12 18:47:35 2016 -0400 Fix quite a few slow memory leaks in config.c This bug was introduced in 8bbbbaf87b5ab3c when we added a separate or_options_free() function but didn't start using it everywhere. Fixes bug 19466. --- changes/bug19466 | 3 +++ src/or/config.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changes/bug19466 b/changes/bug19466 new file mode 100644 index 0000000..d0c2ada --- /dev/null +++ b/changes/bug19466 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leak): + - Fix a series of slow memory leaks related to parsing torrc files + and options. Fixes bug 19466; bugfix on 0.2.1.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index 3fab3b3..06ce161 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -746,7 +746,7 @@ set_options(or_options_t *new_val, char **msg) } if (old_options != global_options) - config_free(&options_format, old_options); + or_options_free(old_options); return 0; } @@ -2143,23 +2143,23 @@ options_trial_assign(config_line_t *list, int use_defaults, if ((r=config_assign(&options_format, trial_options, list, use_defaults, clear_first, msg)) < 0) { - config_free(&options_format, trial_options); + or_options_free(trial_options); return r; } if (options_validate(get_options_mutable(), trial_options, global_default_options, 1, msg) < 0) { - config_free(&options_format, trial_options); + or_options_free(trial_options); return SETOPT_ERR_PARSE; /*XXX make this a separate return value. */ } if (options_transition_allowed(get_options(), trial_options, msg) < 0) { - config_free(&options_format, trial_options); + or_options_free(trial_options); return SETOPT_ERR_TRANSITION; } if (set_options(trial_options, msg)<0) { - config_free(&options_format, trial_options); + or_options_free(trial_options); return SETOPT_ERR_SETTING; } @@ -4873,8 +4873,8 @@ options_init_from_string(const char *cf_defaults, const char *cf, } /* Clear newoptions and re-initialize them with new defaults. */ - config_free(&options_format, newoptions); - config_free(&options_format, newdefaultoptions); + or_options_free(newoptions); + or_options_free(newdefaultoptions); newdefaultoptions = NULL; newoptions = tor_malloc_zero(sizeof(or_options_t)); newoptions->magic_ = OR_OPTIONS_MAGIC; @@ -4927,14 +4927,14 @@ options_init_from_string(const char *cf_defaults, const char *cf, err = SETOPT_ERR_SETTING; goto err; /* frees and replaces old options */ } - config_free(&options_format, global_default_options); + or_options_free(global_default_options); global_default_options = newdefaultoptions; return SETOPT_OK; err: - config_free(&options_format, newoptions); - config_free(&options_format, newdefaultoptions); + or_options_free(newoptions); + or_options_free(newdefaultoptions); if (*msg) { char *old_msg = *msg; tor_asprintf(msg, "Failed to parse/validate config: %s", old_msg);

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit db372addc8534dc6e4639fe943179943b276b051 Merge: 4d70ed7 742ff2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 12 10:27:08 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-august2016 | 4 + src/config/geoip | 14009 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 1108 +++- 3 files changed, 8582 insertions(+), 6539 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 459e5d705eb688642d53f38c00e0a2c6cfd36b8a Merge: 6b740aa db372ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 12 10:27:14 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-august2016 | 4 + src/config/geoip | 14009 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 1108 +++- 3 files changed, 8582 insertions(+), 6539 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'bug19903_028_v2' into maint-0.2.8
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 65cf5130ef60b82bae552363bcca53e5ab9cfd02 Merge: 459e5d7 49843c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:35:26 2016 -0400 Merge branch 'bug19903_028_v2' into maint-0.2.8 changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 49843c980a07b73c9e98c7c7983e7745d5d82751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 20:29:37 2016 -0400 Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}" Fixes bug 19903; bugfix on 0.2.8.1-alpha. --- changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug19903 b/changes/bug19903 new file mode 100644 index 0000000..33aa878 --- /dev/null +++ b/changes/bug19903 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Remove an inappropriate "inline" in tortls.c that was causing warnings + on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha. + diff --git a/src/common/tortls.c b/src/common/tortls.c index b68f5df..9507bb7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void) /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ -STATIC inline tor_tls_t * +STATIC tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 6e181bafff0b62688bae02998784a8e4b7f2167d Merge: ee47010 65cf513 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:35:52 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug19903 | 4 + changes/geoip-august2016 | 4 + src/common/tortls.c | 2 +- src/config/geoip | 14009 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 1108 +++- 5 files changed, 8587 insertions(+), 6540 deletions(-)

1 0

[tor/maint-0.2.8] Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 49843c980a07b73c9e98c7c7983e7745d5d82751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 20:29:37 2016 -0400 Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}" Fixes bug 19903; bugfix on 0.2.8.1-alpha. --- changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug19903 b/changes/bug19903 new file mode 100644 index 0000000..33aa878 --- /dev/null +++ b/changes/bug19903 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Remove an inappropriate "inline" in tortls.c that was causing warnings + on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha. + diff --git a/src/common/tortls.c b/src/common/tortls.c index b68f5df..9507bb7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void) /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ -STATIC inline tor_tls_t * +STATIC tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

1 0

[tor/master] Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 49843c980a07b73c9e98c7c7983e7745d5d82751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 20:29:37 2016 -0400 Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}" Fixes bug 19903; bugfix on 0.2.8.1-alpha. --- changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug19903 b/changes/bug19903 new file mode 100644 index 0000000..33aa878 --- /dev/null +++ b/changes/bug19903 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Remove an inappropriate "inline" in tortls.c that was causing warnings + on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha. + diff --git a/src/common/tortls.c b/src/common/tortls.c index b68f5df..9507bb7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void) /** Helper: given a SSL* pointer, return the tor_tls_t object using that * pointer. */ -STATIC inline tor_tls_t * +STATIC tor_tls_t * tor_tls_get_by_ssl(const SSL *ssl) { tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);

1 0

[tor/master] Merge branch 'bug19903_028_v2' into maint-0.2.8
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 65cf5130ef60b82bae552363bcca53e5ab9cfd02 Merge: 459e5d7 49843c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:35:26 2016 -0400 Merge branch 'bug19903_028_v2' into maint-0.2.8 changes/bug19903 | 4 ++++ src/common/tortls.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0