March 2017 - tor-commits - lists.torproject.org

[tor/master] Fix some compilation warnings in {test_, }hs_descriptor.c
by nickm＠torproject.org 14 Mar '17

14 Mar '17

commit 236e1f31d9bb6494fdc700f49739fe381d10bed6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 22:36:47 2017 -0400 Fix some compilation warnings in {test_,}hs_descriptor.c Nothing big: just some const char[]s that should have been static, and some integer truncation warnings. Warnings not in any released Tor. --- src/or/hs_descriptor.c | 3 ++- src/test/test_hs_descriptor.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index f441fbf..94f7ce8 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1505,8 +1505,9 @@ decode_superencrypted(const char *message, size_t message_len, /* Copy the encrypted blob to the descriptor object so we can handle it * latter if needed. */ + tor_assert(tok->object_size <= INT_MAX); *encrypted_out = tor_memdup(tok->object_body, tok->object_size); - retval = tok->object_size; + retval = (int) tok->object_size; } err: diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 1a1b511..f53caf4 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -1005,7 +1005,7 @@ test_desc_signature(void *arg) } /* bad desc auth type */ -const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n" +static const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "encrypted\n" @@ -1015,7 +1015,7 @@ const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n" "-----END MESSAGE-----\n"; /* bad ephemeral key */ -const char bad_superencrypted_text2[] = "desc-auth-type x25519\n" +static const char bad_superencrypted_text2[] = "desc-auth-type x25519\n" "desc-auth-ephemeral-key differentalphabet\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "encrypted\n" @@ -1025,7 +1025,7 @@ const char bad_superencrypted_text2[] = "desc-auth-type x25519\n" "-----END MESSAGE-----\n"; /* bad encrypted msg */ -const char bad_superencrypted_text3[] = "desc-auth-type x25519\n" +static const char bad_superencrypted_text3[] = "desc-auth-type x25519\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "encrypted\n" @@ -1033,7 +1033,7 @@ const char bad_superencrypted_text3[] = "desc-auth-type x25519\n" "SO SMALL NOT GOOD\n" "-----END MESSAGE-----\n"; -const char correct_superencrypted_text[] = "desc-auth-type x25519\n" +static const char correct_superencrypted_text[] = "desc-auth-type x25519\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "auth-client Od09Qu636Qo /PKLzqewAdS/+0+vZC+MvQ dpw4NFo13zDnuPz45rxrOg\n" @@ -1044,14 +1044,14 @@ const char correct_superencrypted_text[] = "desc-auth-type x25519\n" "BiYWQgYXQgYWxs\n" "-----END MESSAGE-----\n"; -const char correct_encrypted_plaintext[] = "being on mountains, " +static const char correct_encrypted_plaintext[] = "being on mountains, " "thinking about computers, is not bad at all"; static void test_parse_hs_desc_superencrypted(void *arg) { (void) arg; - int retval; + size_t retval; uint8_t *encrypted_out = NULL; { @@ -1059,7 +1059,7 @@ test_parse_hs_desc_superencrypted(void *arg) retval = decode_superencrypted(bad_superencrypted_text1, strlen(bad_superencrypted_text1), &encrypted_out); - tt_int_op(retval, ==, 0); + tt_u64_op(retval, ==, 0); tt_assert(!encrypted_out); expect_log_msg_containing("Unrecognized desc auth type"); teardown_capture_of_logs(); @@ -1070,7 +1070,7 @@ test_parse_hs_desc_superencrypted(void *arg) retval = decode_superencrypted(bad_superencrypted_text2, strlen(bad_superencrypted_text2), &encrypted_out); - tt_int_op(retval, ==, 0); + tt_u64_op(retval, ==, 0); tt_assert(!encrypted_out); expect_log_msg_containing("Bogus desc auth key in HS desc"); teardown_capture_of_logs(); @@ -1081,7 +1081,7 @@ test_parse_hs_desc_superencrypted(void *arg) retval = decode_superencrypted(bad_superencrypted_text3, strlen(bad_superencrypted_text3), &encrypted_out); - tt_int_op(retval, ==, 0); + tt_u64_op(retval, ==, 0); tt_assert(!encrypted_out); expect_log_msg_containing("Length of descriptor\'s encrypted data " "is too small."); @@ -1093,7 +1093,7 @@ test_parse_hs_desc_superencrypted(void *arg) strlen(correct_superencrypted_text), &encrypted_out); - tt_int_op(retval, ==, strlen(correct_encrypted_plaintext)); + tt_u64_op(retval, ==, strlen(correct_encrypted_plaintext)); tt_mem_op(encrypted_out, OP_EQ, correct_encrypted_plaintext, strlen(correct_encrypted_plaintext));

1 0

[tor/master] Add a null statement to prevent some SMARTLIST_FOREACH() bugs.
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit dc37ea8b9815e75905a6b8b606947866afc9b27b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:43:30 2017 -0400 Add a null statement to prevent some SMARTLIST_FOREACH() bugs. So we require that SMARTLIST_FOREACH_END() have the name of the loop variable in it. But right now the only enforcement for that is to clear the variable at the end of the loop, which is really not sufficient: I spent 45 minutes earlier today debugging an issue where I had said: SMARTLIST_FOREACH_BEGIN(spool, spooled_resource_t *, spooled) { ... } SMARTLIST_FOREACH_END(spool); This patch makes it so that ONLY loop variables can be used, by referring to the _sl_idx variable. --- src/common/container.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/container.h b/src/common/container.h index 00c3ca8..826b5d1 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -224,6 +224,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, #define SMARTLIST_FOREACH_END(var) \ var = NULL; \ + (void) var ## _sl_idx; \ } STMT_END /**

1 0

[tor/master] Fix a memory leak in config_get_assigned_option()
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit 27058bd8cb84c523ff5216bababd6c6b7f4f9bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:06:48 2017 -0500 Fix a memory leak in config_get_assigned_option() This was introducd in 4d83999213712c7 in 0.3.0.3-alpha. This is bug 21682. --- changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug21682 b/changes/bug21682 new file mode 100644 index 0000000..ab7126e --- /dev/null +++ b/changes/bug21682 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when using GETCONF on a port option. + Fixes bug 21682; bugfix on 0.3.0.3-alpha. diff --git a/src/or/confparse.c b/src/or/confparse.c index 9e352ac..9b13a91 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options, tor_free(result); return NULL; case CONFIG_TYPE_LINELIST_S: + tor_free(result->key); tor_free(result); result = config_lines_dup_and_filter(*(const config_line_t **)value, key);

1 0

[tor/master] Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit e2cd600da6e99c38193a6bd326b4208b1fc380d8 Merge: ded2c8c 27058bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:22:40 2017 -0400 Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0 changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/maint-0.3.0] Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit e2cd600da6e99c38193a6bd326b4208b1fc380d8 Merge: ded2c8c 27058bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:22:40 2017 -0400 Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0 changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit e2cd600da6e99c38193a6bd326b4208b1fc380d8 Merge: ded2c8c 27058bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:22:40 2017 -0400 Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0 changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit d9cd4b7072f6292680c188ccb9fe8d2c5be4f610 Merge: 43dd9bf e2cd600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:22:54 2017 -0400 Merge branch 'maint-0.3.0' changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)

1 0

[tor/release-0.3.0] Fix a memory leak in config_get_assigned_option()
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit 27058bd8cb84c523ff5216bababd6c6b7f4f9bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:06:48 2017 -0500 Fix a memory leak in config_get_assigned_option() This was introducd in 4d83999213712c7 in 0.3.0.3-alpha. This is bug 21682. --- changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug21682 b/changes/bug21682 new file mode 100644 index 0000000..ab7126e --- /dev/null +++ b/changes/bug21682 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when using GETCONF on a port option. + Fixes bug 21682; bugfix on 0.3.0.3-alpha. diff --git a/src/or/confparse.c b/src/or/confparse.c index 9e352ac..9b13a91 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options, tor_free(result); return NULL; case CONFIG_TYPE_LINELIST_S: + tor_free(result->key); tor_free(result); result = config_lines_dup_and_filter(*(const config_line_t **)value, key);

1 0

[tor/maint-0.3.0] Fix a memory leak in config_get_assigned_option()
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit 27058bd8cb84c523ff5216bababd6c6b7f4f9bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:06:48 2017 -0500 Fix a memory leak in config_get_assigned_option() This was introducd in 4d83999213712c7 in 0.3.0.3-alpha. This is bug 21682. --- changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug21682 b/changes/bug21682 new file mode 100644 index 0000000..ab7126e --- /dev/null +++ b/changes/bug21682 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a memory leak when using GETCONF on a port option. + Fixes bug 21682; bugfix on 0.3.0.3-alpha. diff --git a/src/or/confparse.c b/src/or/confparse.c index 9e352ac..9b13a91 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -779,6 +779,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options, tor_free(result); return NULL; case CONFIG_TYPE_LINELIST_S: + tor_free(result->key); tor_free(result); result = config_lines_dup_and_filter(*(const config_line_t **)value, key);

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 13 Mar '17

13 Mar '17

commit 0c58627c1cb134d57bb653007d67d9c4a8119faa Merge: 51ae5d8 e2cd600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 13 16:22:49 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)

1 0