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

[torsocks/master] Merge remote-tracking branch 'debian/bugfix/typo-catched'
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 3c3a1a808a738156b65c76b56cd5b98c69806f85 Merge: 2f54670 2810dd4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:41:03 2017 -0400 Merge remote-tracking branch 'debian/bugfix/typo-catched'

1 0

[torsocks/master] Fix typo: subsytem → subsystem.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit c822b5c2cdac0d9f7e0706de488d282bebd2e543 Author: intrigeri <intrigeri(a)boum.org> Date: Wed Oct 19 20:55:26 2016 +0000 Fix typo: subsytem → subsystem. --- src/lib/torsocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 731b33c..f1be6bc 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -256,7 +256,7 @@ error_dlopen: } /* - * Initialize logging subsytem using either the default values or … [View More]

1 0

[torsocks/master] Merge remote-tracking branch 'debian/bugfix/typo-conect'
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 2f54670bb06be303a485d69b9254395e56d281e7 Merge: 3ea5ca1 b072b72 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:39:54 2017 -0400 Merge remote-tracking branch 'debian/bugfix/typo-conect' src/lib/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torsocks/master] Fix typo: conect → connect.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit b072b72ca0e4e4598bd7b2a96e6e2a8681a57148 Author: intrigeri <intrigeri(a)boum.org> Date: Wed Oct 19 21:15:51 2016 +0000 Fix typo: conect → connect. --- src/lib/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/connect.c b/src/lib/connect.c index 4f18289..7f5657c 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -60,7 +60,7 @@ int tsocks_validate_socket(int sockfd, const struct sockaddr *addr) * to allow AF_UNIX/_LOCAL socket to … [View More]

1 0

[torsocks/master] Fix typo: catched → caught.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 2810dd44bb8928cfffda0c028701b98f84f305b3 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jan 12 05:22:02 2016 +0000 Fix typo: catched → caught. Spotted by Lintian. --- src/common/compat.h | 2 +- src/lib/close.c | 2 +- src/lib/connect.c | 2 +- src/lib/fclose.c | 2 +- src/lib/sendto.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index ce47129..fbaee3f 100644 --- a/src/common/compat.… [View More]h +++ b/src/common/compat.h @@ -64,7 +64,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)); /* * Some old system requires kernel headers for those values. If they are not * defined, set them to a bad syscall value. Just to be clear, if the value is - * undefined, tsocks syscall() will DENY the real syscall if catched. + * undefined, tsocks syscall() will DENY the real syscall if caught. * * The values are not the same per syscall here so we don't end up with * duplicates in the switch case in the tsocks sycall wrapper. diff --git a/src/lib/close.c b/src/lib/close.c index 7fb9e53..23c80e6 100644 --- a/src/lib/close.c +++ b/src/lib/close.c @@ -30,7 +30,7 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG) { struct connection *conn; - DBG("Close catched for fd %d", fd); + DBG("Close caught for fd %d", fd); connection_registry_lock(); conn = connection_find(fd); diff --git a/src/lib/connect.c b/src/lib/connect.c index 2480643..ac51835 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -109,7 +109,7 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) struct connection *new_conn; struct onion_entry *on_entry; - DBG("Connect catched on fd %d", sockfd); + DBG("Connect caught on fd %d", sockfd); /* * Validate socket values in order to see if we can handle this connect diff --git a/src/lib/fclose.c b/src/lib/fclose.c index b6f3251..6bb6a2c 100644 --- a/src/lib/fclose.c +++ b/src/lib/fclose.c @@ -42,7 +42,7 @@ LIBC_FCLOSE_RET_TYPE tsocks_fclose(LIBC_FCLOSE_SIG) goto error; } - DBG("[fclose] Close catched for fd %d", fd); + DBG("[fclose] Close caught for fd %d", fd); connection_registry_lock(); conn = connection_find(fd); diff --git a/src/lib/sendto.c b/src/lib/sendto.c index 6b1d3ff..087eb1f 100644 --- a/src/lib/sendto.c +++ b/src/lib/sendto.c @@ -51,7 +51,7 @@ LIBC_SENDTO_RET_TYPE tsocks_sendto(LIBC_SENDTO_SIG) goto libc_sendto; } - DBG("[sendto] TCP fast open catched on fd %d", sockfd); + DBG("[sendto] TCP fast open caught on fd %d", sockfd); ret = connect(sockfd, dest_addr, addrlen); if (ret == 0) { [View Less]

1 0

[torsocks/master] doc: Add autogen.sh step to README
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 3ea5ca1f0be0c6f120088db345db67a674ca6590 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:09:07 2017 -0400 doc: Add autogen.sh step to README Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8ad574f..d67fd51 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Requirements Installation ----------------- + $ ./autogen.sh $ ./configure $ … [View More]

1 0

[tor/master] Fix memory leak of "torrcd" in test_config_include_folder_order()
by nickm＠torproject.org 04 Aug '17

04 Aug '17

commit ce07b4dd918cc3a6043f4fd676ec98492c5137a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 4 13:50:27 2017 -0400 Fix memory leak of "torrcd" in test_config_include_folder_order() Bugfix on 0265ced02b7a652c5941cb2c14ee1e0de0b1d90e; bug not in any released Tor. --- src/test/test_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 24cb65271..6b875a0a0 100644 --- a/src/test/test_config.c +++ … [View More]

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Aug '17

04 Aug '17

commit a542104a0719c8b0674fdd6e68631bda9a4c5b27 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 4 17:45:43 2017 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 13 +++++++++++++ fr_CA/https-everywhere.dtd | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 855d793c4..27d2ae234 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.… [View More]dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> + <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés !"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index d2257bca8..505c6506d 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> + <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> [View Less]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '17

04 Aug '17

commit 00124a5caf22b224c85fe659f5c633969bea4ace Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 4 17:45:33 2017 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 24 ++++++++++++------------ fr_CA/https-everywhere.dtd | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index f4fad3816..27d2ae234 100644 --- a/fr/https-everywhere.dtd … [View More]+++ b/fr/https-everywhere.dtd @@ -24,22 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> -<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> -<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> -<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> -<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> -<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'"> -<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section."> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés !"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index 3739d511b..505c6506d 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -24,22 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> -<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> -<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> -<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> -<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> -<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'"> -<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section."> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> [View Less]

1 0

[tor/master] Remove usage of the PATH_MAX variable
by nickm＠torproject.org 04 Aug '17

04 Aug '17

commit 0265ced02b7a652c5941cb2c14ee1e0de0b1d90e Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Aug 3 15:06:26 2017 +0000 Remove usage of the PATH_MAX variable GNU Hurd does not define the PATH_MAX variable. Using the variable on this platform results in compilation errors. Closes #23098. --- changes/bug23098 | 4 +++ src/test/test_config.c | 91 ++++++++++++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 39 … [View More]deletions(-) diff --git a/changes/bug23098 b/changes/bug23098 new file mode 100644 index 000000000..2075f13ba --- /dev/null +++ b/changes/bug23098 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Stop using the PATH_MAX variable. The variable is not defined in + GNU Hurd which prevents Tor from being built. Fixes bug 23098; + bugfix on 0.3.1.1-alpha. diff --git a/src/test/test_config.c b/src/test/test_config.c index 40d562a6f..24cb65271 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4816,6 +4816,7 @@ test_config_include_limit(void *data) (void)data; config_line_t *result = NULL; + char *torrc_path = NULL; char *dir = tor_strdup(get_fname("test_include_limit")); tt_ptr_op(dir, OP_NE, NULL); @@ -4825,8 +4826,7 @@ test_config_include_limit(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char torrc_path[PATH_MAX+1]; - tor_snprintf(torrc_path, sizeof(torrc_path), "%s"PATH_SEPARATOR"torrc", dir); + tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir); char torrc_contents[1000]; tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s", torrc_path); @@ -4837,6 +4837,7 @@ test_config_include_limit(void *data) done: config_free_lines(result); + tor_free(torrc_path); tor_free(dir); } @@ -4847,6 +4848,7 @@ test_config_include_does_not_exist(void *data) config_line_t *result = NULL; char *dir = tor_strdup(get_fname("test_include_does_not_exist")); + char *missing_path = NULL; tt_ptr_op(dir, OP_NE, NULL); #ifdef _WIN32 @@ -4855,9 +4857,7 @@ test_config_include_does_not_exist(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char missing_path[PATH_MAX+1]; - tor_snprintf(missing_path, sizeof(missing_path), "%s"PATH_SEPARATOR"missing", - dir); + tor_asprintf(&missing_path, "%s"PATH_SEPARATOR"missing", dir); char torrc_contents[1000]; tor_snprintf(torrc_contents, sizeof(torrc_contents), "%%include %s", missing_path); @@ -4868,6 +4868,7 @@ test_config_include_does_not_exist(void *data) done: config_free_lines(result); tor_free(dir); + tor_free(missing_path); } static void @@ -4877,6 +4878,7 @@ test_config_include_error_in_included_file(void *data) config_line_t *result = NULL; char *dir = tor_strdup(get_fname("test_error_in_included_file")); + char *invalid_path = NULL; tt_ptr_op(dir, OP_NE, NULL); #ifdef _WIN32 @@ -4885,9 +4887,7 @@ test_config_include_error_in_included_file(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char invalid_path[PATH_MAX+1]; - tor_snprintf(invalid_path, sizeof(invalid_path), "%s"PATH_SEPARATOR"invalid", - dir); + tor_asprintf(&invalid_path, "%s"PATH_SEPARATOR"invalid", dir); tt_int_op(write_str_to_file(invalid_path, "unclosed \"", 0), OP_EQ, 0); char torrc_contents[1000]; @@ -4900,6 +4900,7 @@ test_config_include_error_in_included_file(void *data) done: config_free_lines(result); tor_free(dir); + tor_free(invalid_path); } static void @@ -4908,6 +4909,8 @@ test_config_include_empty_file_folder(void *data) (void)data; config_line_t *result = NULL; + char *folder_path = NULL; + char *file_path = NULL; char *dir = tor_strdup(get_fname("test_include_empty_file_folder")); tt_ptr_op(dir, OP_NE, NULL); @@ -4917,17 +4920,13 @@ test_config_include_empty_file_folder(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char folder_path[PATH_MAX+1]; - tor_snprintf(folder_path, sizeof(folder_path), "%s"PATH_SEPARATOR"empty_dir", - dir); + tor_asprintf(&folder_path, "%s"PATH_SEPARATOR"empty_dir", dir); #ifdef _WIN32 tt_int_op(mkdir(folder_path), OP_EQ, 0); #else tt_int_op(mkdir(folder_path, 0700), OP_EQ, 0); #endif - char file_path[PATH_MAX+1]; - tor_snprintf(file_path, sizeof(file_path), "%s"PATH_SEPARATOR"empty_file", - dir); + tor_asprintf(&file_path, "%s"PATH_SEPARATOR"empty_file", dir); tt_int_op(write_str_to_file(file_path, "", 0), OP_EQ, 0); char torrc_contents[1000]; @@ -4944,6 +4943,8 @@ test_config_include_empty_file_folder(void *data) done: config_free_lines(result); + tor_free(folder_path); + tor_free(file_path); tor_free(dir); } @@ -4953,6 +4954,7 @@ test_config_include_recursion_before_after(void *data) (void)data; config_line_t *result = NULL; + char *torrc_path = NULL; char *dir = tor_strdup(get_fname("test_include_recursion_before_after")); tt_ptr_op(dir, OP_NE, NULL); @@ -4962,8 +4964,7 @@ test_config_include_recursion_before_after(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char torrc_path[PATH_MAX+1]; - tor_snprintf(torrc_path, sizeof(torrc_path), "%s"PATH_SEPARATOR"torrc", dir); + tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir); char file_contents[1000]; const int limit = MAX_INCLUDE_RECURSION_LEVEL; @@ -4982,9 +4983,10 @@ test_config_include_recursion_before_after(void *data) } if (i > 1) { - char file_path[PATH_MAX+1]; - tor_snprintf(file_path, sizeof(file_path), "%s%d", torrc_path, i); + char *file_path = NULL; + tor_asprintf(&file_path, "%s%d", torrc_path, i); tt_int_op(write_str_to_file(file_path, file_contents, 0), OP_EQ, 0); + tor_free(file_path); } } @@ -5008,6 +5010,7 @@ test_config_include_recursion_before_after(void *data) done: config_free_lines(result); tor_free(dir); + tor_free(torrc_path); } static void @@ -5016,6 +5019,7 @@ test_config_include_recursion_after_only(void *data) (void)data; config_line_t *result = NULL; + char *torrc_path = NULL; char *dir = tor_strdup(get_fname("test_include_recursion_after_only")); tt_ptr_op(dir, OP_NE, NULL); @@ -5025,8 +5029,7 @@ test_config_include_recursion_after_only(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char torrc_path[PATH_MAX+1]; - tor_snprintf(torrc_path, sizeof(torrc_path), "%s"PATH_SEPARATOR"torrc", dir); + tor_asprintf(&torrc_path, "%s"PATH_SEPARATOR"torrc", dir); char file_contents[1000]; const int limit = MAX_INCLUDE_RECURSION_LEVEL; @@ -5045,9 +5048,10 @@ test_config_include_recursion_after_only(void *data) } if (i > 1) { - char file_path[PATH_MAX+1]; - tor_snprintf(file_path, sizeof(file_path), "%s%d", torrc_path, i); + char *file_path = NULL; + tor_asprintf(&file_path, "%s%d", torrc_path, i); tt_int_op(write_str_to_file(file_path, file_contents, 0), OP_EQ, 0); + tor_free(file_path); } } @@ -5071,6 +5075,7 @@ test_config_include_recursion_after_only(void *data) done: config_free_lines(result); tor_free(dir); + tor_free(torrc_path); } static void @@ -5079,6 +5084,9 @@ test_config_include_folder_order(void *data) (void)data; config_line_t *result = NULL; + char *torrcd = NULL; + char *path = NULL; + char *path2 = NULL; char *dir = tor_strdup(get_fname("test_include_folder_order")); tt_ptr_op(dir, OP_NE, NULL); @@ -5088,8 +5096,7 @@ test_config_include_folder_order(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char torrcd[PATH_MAX+1]; - tor_snprintf(torrcd, sizeof(torrcd), "%s"PATH_SEPARATOR"%s", dir, "torrc.d"); + tor_asprintf(&torrcd, "%s"PATH_SEPARATOR"%s", dir, "torrc.d"); #ifdef _WIN32 tt_int_op(mkdir(torrcd), OP_EQ, 0); @@ -5098,9 +5105,7 @@ test_config_include_folder_order(void *data) #endif // test that files in subfolders are ignored - char path[PATH_MAX+1]; - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, - "subfolder"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "subfolder"); #ifdef _WIN32 tt_int_op(mkdir(path), OP_EQ, 0); @@ -5108,27 +5113,31 @@ test_config_include_folder_order(void *data) tt_int_op(mkdir(path, 0700), OP_EQ, 0); #endif - char path2[PATH_MAX+1]; - tor_snprintf(path2, sizeof(path2), "%s"PATH_SEPARATOR"%s", path, - "01_ignore"); + tor_asprintf(&path2, "%s"PATH_SEPARATOR"%s", path, "01_ignore"); tt_int_op(write_str_to_file(path2, "ShouldNotSee 1\n", 0), OP_EQ, 0); + tor_free(path); // test that files starting with . are ignored - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, ".dot"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, ".dot"); tt_int_op(write_str_to_file(path, "ShouldNotSee 2\n", 0), OP_EQ, 0); + tor_free(path); // test file order - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, "01_1st"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "01_1st"); tt_int_op(write_str_to_file(path, "Test 1\n", 0), OP_EQ, 0); + tor_free(path); - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, "02_2nd"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "02_2nd"); tt_int_op(write_str_to_file(path, "Test 2\n", 0), OP_EQ, 0); + tor_free(path); - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, "aa_3rd"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "aa_3rd"); tt_int_op(write_str_to_file(path, "Test 3\n", 0), OP_EQ, 0); + tor_free(path); - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", torrcd, "ab_4th"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", torrcd, "ab_4th"); tt_int_op(write_str_to_file(path, "Test 4\n", 0), OP_EQ, 0); + tor_free(path); char torrc_contents[1000]; tor_snprintf(torrc_contents, sizeof(torrc_contents), @@ -5154,6 +5163,8 @@ test_config_include_folder_order(void *data) done: config_free_lines(result); + tor_free(path); + tor_free(path2); tor_free(dir); } @@ -5285,6 +5296,7 @@ test_config_include_flag_torrc_only(void *data) (void)data; char *errmsg = NULL; + char *path = NULL; char *dir = tor_strdup(get_fname("test_include_flag_torrc_only")); tt_ptr_op(dir, OP_NE, NULL); @@ -5294,8 +5306,7 @@ test_config_include_flag_torrc_only(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char path[PATH_MAX+1]; - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", dir, "dummy"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", dir, "dummy"); tt_int_op(write_str_to_file(path, "\n", 0), OP_EQ, 0); char conf_empty[1000]; @@ -5315,6 +5326,7 @@ test_config_include_flag_torrc_only(void *data) done: tor_free(errmsg); + tor_free(path); tor_free(dir); } @@ -5324,6 +5336,7 @@ test_config_include_flag_defaults_only(void *data) (void)data; char *errmsg = NULL; + char *path = NULL; char *dir = tor_strdup(get_fname("test_include_flag_defaults_only")); tt_ptr_op(dir, OP_NE, NULL); @@ -5333,8 +5346,7 @@ test_config_include_flag_defaults_only(void *data) tt_int_op(mkdir(dir, 0700), OP_EQ, 0); #endif - char path[PATH_MAX+1]; - tor_snprintf(path, sizeof(path), "%s"PATH_SEPARATOR"%s", dir, "dummy"); + tor_asprintf(&path, "%s"PATH_SEPARATOR"%s", dir, "dummy"); tt_int_op(write_str_to_file(path, "\n", 0), OP_EQ, 0); char conf_empty[1000]; @@ -5354,6 +5366,7 @@ test_config_include_flag_defaults_only(void *data) done: tor_free(errmsg); + tor_free(path); tor_free(dir); } [View Less]

1 0