February 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug7816_023'
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 5f29bc71b37a83e6d583864ad9b7cd97f513e24a Merge: fd8ef8d afca9ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:14:17 2013 -0500 Merge remote-tracking branch 'public/bug7816_023' src/or/config.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --cc src/or/config.c index 0f8441b,16eadf9..7ca20e4 --- a/src/or/config.c +++ b/src/or/config.c @@@ -601,14 -773,16 +601,17 @@@ set_options(or_options_t *new_val, cha var->type == CONFIG_TYPE_OBSOLETE) { continue; } - if (!option_is_same(&options_format, new_val, old_options, var_name)) { - line = get_assigned_option(&options_format, new_val, var_name, 1); + if (!config_is_same(&options_format, new_val, old_options, var_name)) { + line = config_get_assigned_option(&options_format, new_val, + var_name, 1); if (line) { - for (; line; line = line->next) { + config_line_t *next; + for (; line; line = next) { + next = line->next; smartlist_add(elements, line->key); smartlist_add(elements, line->value); + tor_free(line); } } else { smartlist_add(elements, (char*)options_format.vars[i].name);

1 0

[tor/master] Fix another memory leak
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit afca9ab14ee16b8dcfcde40a13d49f3612138dcb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:12:49 2013 -0500 Fix another memory leak This one occurs when changing configuration options. Found by coverity. --- src/or/config.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 90a5dfb..16eadf9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -777,9 +777,12 @@ set_options(or_options_t *new_val, char **msg) line = get_assigned_option(&options_format, new_val, var_name, 1); if (line) { - for (; line; line = line->next) { + config_line_t *next; + for (; line; line = next) { + next = line->next; smartlist_add(elements, line->key); smartlist_add(elements, line->value); + tor_free(line); } } else { smartlist_add(elements, (char*)options_format.vars[i].name);

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Feb '13

11 Feb '13

commit 99c7a05b5cf88c530ac3e7ada038a21b06a23719 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 11 21:16:07 2013 +0000 Update translations for mat-gui --- pt_BR.po | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/pt_BR.po b/pt_BR.po new file mode 100644 index 0000000..2c9ac88 --- /dev/null +++ b/pt_BR.po @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Marcos Ortiz <marcosortizf(a)gmail.com>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-01-05 20:03+0100\n" +"PO-Revision-Date: 2013-02-11 21:13+0000\n" +"Last-Translator: marcosof <marcosortizf(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: mat-gui:95 mat-gui:563 mat-gui:579 +msgid "Ready" +msgstr "Pronto" + +#: mat-gui:107 +msgid "Add" +msgstr "Adiciona" + +#: mat-gui:109 mat-gui:183 +msgid "Add files" +msgstr "Adiciona arquivos" + +#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 +#: mat-gui:573 mat-gui:575 +msgid "Clean" +msgstr "Limpar" + +#: mat-gui:115 +msgid "Clean selected files" +msgstr "Limpar arquivos selecionados" + +#: mat-gui:119 mat-gui:214 +msgid "Check" +msgstr "Verificar" + +#: mat-gui:121 +msgid "Check selected files for harmful meta" +msgstr "" + +#: mat-gui:125 mat-gui:185 +msgid "Quit" +msgstr "" + +#: mat-gui:137 +msgid "Path" +msgstr "" + +#: mat-gui:137 mat-gui:363 +msgid "Filename" +msgstr "" + +#: mat-gui:137 mat-gui:365 +msgid "Mimetype" +msgstr "" + +#: mat-gui:137 +msgid "State" +msgstr "" + +#: mat-gui:138 +msgid "Cleaned file" +msgstr "" + +#: mat-gui:182 +msgid "Files" +msgstr "" + +#: mat-gui:188 +msgid "Edit" +msgstr "" + +#: mat-gui:189 +msgid "Clear the filelist" +msgstr "" + +#: mat-gui:192 mat-gui:447 +msgid "Preferences" +msgstr "" + +#: mat-gui:195 +msgid "Process" +msgstr "" + +#: mat-gui:218 +msgid "Help" +msgstr "" + +#: mat-gui:219 mat-gui:395 +msgid "Supported formats" +msgstr "" + +#: mat-gui:220 +msgid "About" +msgstr "" + +#: mat-gui:241 +msgid "Choose files" +msgstr "" + +#: mat-gui:248 +msgid "All files" +msgstr "" + +#: mat-gui:255 +msgid "Supported files" +msgstr "" + +#: mat-gui:297 +msgid "unknow" +msgstr "" + +#: mat-gui:313 mat-gui:559 +msgid "Dirty" +msgstr "" + +#: mat-gui:343 +msgid "Not-supported" +msgstr "" + +#: mat-gui:381 +msgid "This software was coded during the GSoC 2011" +msgstr "" + +#: mat-gui:386 +msgid "Website" +msgstr "" + +#: mat-gui:461 +msgid "Force Clean" +msgstr "" + +#: mat-gui:464 +msgid "Do not check if already clean before cleaning" +msgstr "" + +#: mat-gui:468 +msgid "Backup" +msgstr "" + +#: mat-gui:471 +msgid "Keep a backup copy" +msgstr "" + +#: mat-gui:474 +msgid "Reduce PDF quality" +msgstr "" + +#: mat-gui:477 +msgid "Reduce the produced PDF size and quality" +msgstr "" + +#: mat-gui:480 +msgid "Add unsupported file to archives" +msgstr "" + +#: mat-gui:484 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "" + +#: mat-gui:554 +#, python-format +msgid "Checking %s..." +msgstr "" + +#: mat-gui:572 +#, python-format +msgid "Cleaning %s..." +msgstr ""

1 0

[tor/master] Check whether ei is non-NULL before altering it.
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit e3578d52e4d32483422cb867786373c2b7b493b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:05:03 2013 -0500 Check whether ei is non-NULL before altering it. This fixes a crash bug if we fail to generate an extrainfo descriptor. Fixes bug 8208; bugfix on 0.2.3.16-alpha. --- changes/bug8208 | 4 ++++ src/or/router.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug8208 b/changes/bug8208 new file mode 100644 index 0000000..c85db90 --- /dev/null +++ b/changes/bug8208 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid a crash if we fail to generate an extrinfo descriptor. + Fixes bug 8208; bugfix on 0.2.3.16-alpha. Found by Coverity; + this is CID 718634. diff --git a/src/or/router.c b/src/or/router.c index 38f1cdd..350666d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1702,9 +1702,13 @@ router_rebuild_descriptor(int force) anyway, since they don't have a DirPort, and always connect to the bridge authority anonymously. But just in case they somehow think of sending them on an unencrypted connection, don't allow them to try. */ - ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 0; + ri->cache_info.send_unencrypted = 0; + if (ei) + ei->cache_info.send_unencrypted = 0 } else { - ri->cache_info.send_unencrypted = ei->cache_info.send_unencrypted = 1; + ri->cache_info.send_unencrypted = 1; + if (ei) + ei->cache_info.send_unencrypted = 1; } router_get_router_hash(ri->cache_info.signed_descriptor_body,

1 0

[tor/master] Suppress a coverity false positive in connection_edge_package_raw_inbuf
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 43d2f99d54d92234615d68935661787d14a89688 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 15:55:50 2013 -0500 Suppress a coverity false positive in connection_edge_package_raw_inbuf Coverity is worried that we're checking entry_conn in some cases, but not in the case where we set entry_conn->pending_optimistic_data. This commit should calm it down (CID 718623). --- src/or/relay.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 12283fc..22bc40d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1563,11 +1563,12 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, circuit_t *circ; const unsigned domain = conn->base_.type == CONN_TYPE_AP ? LD_APP : LD_EXIT; int sending_from_optimistic = 0; + entry_connection_t *entry_conn = + conn->base_.type == CONN_TYPE_AP ? EDGE_TO_ENTRY_CONN(conn) : NULL; const int sending_optimistically = + entry_conn && conn->base_.type == CONN_TYPE_AP && conn->base_.state != AP_CONN_STATE_OPEN; - entry_connection_t *entry_conn = - conn->base_.type == CONN_TYPE_AP ? EDGE_TO_ENTRY_CONN(conn) : NULL; crypt_path_t *cpath_layer = conn->cpath_layer; tor_assert(conn);

1 0

[tor/master] Merge remote-tracking branch 'public/bug8208'
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b Merge: 43d2f99 e3578d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 16:06:02 2013 -0500 Merge remote-tracking branch 'public/bug8208' changes/bug8208 | 4 ++++ src/or/router.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix even more dead code and resource leaks in the unit tests
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 52263b0dda85632ea1deb0f05a83a39d4876f3ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 15:20:20 2013 -0500 Fix even more dead code and resource leaks in the unit tests Found by coverity --- src/test/bench.c | 8 ++++++-- src/test/test_replay.c | 6 ------ src/test/test_util.c | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/test/bench.c b/src/test/bench.c index 18a5154..5a8d21d 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -124,8 +124,10 @@ bench_onion_TAP(void) key = crypto_pk_new(); key2 = crypto_pk_new(); - crypto_pk_generate_key_with_bits(key, 1024); - crypto_pk_generate_key_with_bits(key2, 1024); + if (crypto_pk_generate_key_with_bits(key, 1024) < 0) + goto done; + if (crypto_pk_generate_key_with_bits(key2, 1024) < 0) + goto done; reset_perftime(); start = perftime(); @@ -171,7 +173,9 @@ bench_onion_TAP(void) printf("Client-side, part 2: %f usec.\n", NANOCOUNT(start, end, iters)/1e3); + done: crypto_pk_free(key); + crypto_pk_free(key2); } #ifdef CURVE25519_ENABLED diff --git a/src/test/test_replay.c b/src/test/test_replay.c index be48df1..de841ad 100644 --- a/src/test/test_replay.c +++ b/src/test/test_replay.c @@ -24,7 +24,6 @@ test_replaycache_alloc(void) r = replaycache_new(600, 300); test_assert(r != NULL); - if (!r) goto done; done: if (r) replaycache_free(r); @@ -40,7 +39,6 @@ test_replaycache_miss(void) r = replaycache_new(600, 300); test_assert(r != NULL); - if (!r) goto done; result = replaycache_add_and_test_internal(1200, r, test_buffer, @@ -61,7 +59,6 @@ test_replaycache_hit(void) r = replaycache_new(600, 300); test_assert(r != NULL); - if (!r) goto done; result = replaycache_add_and_test_internal(1200, r, test_buffer, @@ -87,7 +84,6 @@ test_replaycache_age(void) r = replaycache_new(600, 300); test_assert(r != NULL); - if (!r) goto done; result = replaycache_add_and_test_internal(1200, r, test_buffer, @@ -119,7 +115,6 @@ test_replaycache_elapsed(void) r = replaycache_new(600, 300); test_assert(r != NULL); - if (!r) goto done; result = replaycache_add_and_test_internal(1200, r, test_buffer, @@ -146,7 +141,6 @@ test_replaycache_noexpire(void) r = replaycache_new(0, 0); test_assert(r != NULL); - if (!r) goto done; result = replaycache_add_and_test_internal(1200, r, test_buffer, diff --git a/src/test/test_util.c b/src/test/test_util.c index b7a69b2..b17e414 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -53,7 +53,6 @@ test_util_read_until_eof_impl(const char *fname, size_t file_len, fd = open(fifo_name, O_RDONLY|O_BINARY); tt_int_op(fd, >=, 0); str = read_file_to_str_until_eof(fd, read_limit, &sz); - close(fd); tt_assert(str != NULL); if (read_limit < file_len) @@ -69,6 +68,8 @@ test_util_read_until_eof_impl(const char *fname, size_t file_len, tor_free(fifo_name); tor_free(test_str); tor_free(str); + if (fd >= 0) + close(fd); } static void

1 0

[tor/master] Resolve memory leaks in the unit tests and benchmarks (found by coverity)
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 717946089b6008e4744522845014dafa1fc4e37c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 14:57:10 2013 -0500 Resolve memory leaks in the unit tests and benchmarks (found by coverity) These shouldn't really matter, but it's nice to be leak-free. --- src/test/bench.c | 2 ++ src/test/test.c | 1 + src/test/test_crypto.c | 3 +++ src/test/test_ntor_cl.c | 24 ++++++++++++++---------- src/test/test_util.c | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/test/bench.c b/src/test/bench.c index d57aeb8..18a5154 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -164,6 +164,7 @@ bench_onion_TAP(void) int s; dh = crypto_dh_dup(dh_out); s = onion_skin_TAP_client_handshake(dh, or, key_out, sizeof(key_out)); + crypto_dh_free(dh); tor_assert(s == 0); } end = perftime(); @@ -203,6 +204,7 @@ bench_onion_ntor(void) end = perftime(); printf("Client-side, part 1: %f usec.\n", NANOCOUNT(start, end, iters)/1e3); + state = NULL; onion_skin_ntor_create(nodeid, &keypair1.pubkey, &state, os); start = perftime(); for (i = 0; i < iters; ++i) { diff --git a/src/test/test.c b/src/test/test.c index b838172..be0737c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1789,6 +1789,7 @@ test_geoip(void) done: tor_free(s); + tor_free(v); } /** Run unit tests for stats code. */ diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 33c3d44..afb338a 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1082,6 +1082,7 @@ test_crypto_curve25519_persist(void *arg) tt_int_op(0,==,curve25519_keypair_write_to_file(&keypair, fname, "testing")); tt_int_op(0,==,curve25519_keypair_read_from_file(&keypair2, &tag, fname)); tt_str_op(tag,==,"testing"); + tor_free(tag); test_memeq(keypair.pubkey.public_key, keypair2.pubkey.public_key, @@ -1109,6 +1110,7 @@ test_crypto_curve25519_persist(void *arg) fname = tor_strdup(get_fname("bogus_keypair")); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); + tor_free(tag); content[69] ^= 0xff; tt_int_op(0, ==, write_bytes_to_file(fname, content, st.st_size, 1)); @@ -1117,6 +1119,7 @@ test_crypto_curve25519_persist(void *arg) done: tor_free(fname); tor_free(content); + tor_free(tag); } #endif diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index d16b088a..f2b7a72 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -43,13 +43,11 @@ client1(int argc, char **argv) /* client1 nodeID B -> msg state */ curve25519_public_key_t B; uint8_t node_id[DIGEST_LEN]; - ntor_handshake_state_t *state; + ntor_handshake_state_t *state = NULL; uint8_t msg[NTOR_ONIONSKIN_LEN]; char buf[1024]; - memset(&state, 0, sizeof(state)); - N_ARGS(4); BASE16(2, node_id, DIGEST_LEN); BASE16(3, B.public_key, CURVE25519_PUBKEY_LEN); @@ -63,6 +61,7 @@ client1(int argc, char **argv) printf("%s\n", buf); base16_encode(buf, sizeof(buf), (void*)state, sizeof(*state)); printf("%s\n", buf); + ntor_handshake_state_free(state); return 0; } @@ -77,8 +76,9 @@ server1(int argc, char **argv) int keybytes; uint8_t msg_out[NTOR_REPLY_LEN]; - uint8_t *keys; - char *hexkeys; + uint8_t *keys = NULL; + char *hexkeys = NULL; + int result = 0; char buf[256]; @@ -98,7 +98,8 @@ server1(int argc, char **argv) msg_in, keymap, NULL, node_id, msg_out, keys, (size_t)keybytes)<0) { fprintf(stderr, "handshake failed"); - return 2; + result = 2; + goto done; } base16_encode(buf, sizeof(buf), (const char*)msg_out, sizeof(msg_out)); @@ -106,9 +107,10 @@ server1(int argc, char **argv) base16_encode(hexkeys, keybytes*2+1, (const char*)keys, keybytes); printf("%s\n", hexkeys); + done: tor_free(keys); tor_free(hexkeys); - return 0; + return result; } static int @@ -119,6 +121,7 @@ client2(int argc, char **argv) int keybytes; uint8_t *keys; char *hexkeys; + int result = 0; N_ARGS(5); BASE16(2, (&state), sizeof(state)); @@ -129,16 +132,17 @@ client2(int argc, char **argv) hexkeys = tor_malloc(keybytes*2+1); if (onion_skin_ntor_client_handshake(&state, msg, keys, keybytes)<0) { fprintf(stderr, "handshake failed"); - return 2; + result = 2; + goto done; } base16_encode(hexkeys, keybytes*2+1, (const char*)keys, keybytes); printf("%s\n", hexkeys); + done: tor_free(keys); tor_free(hexkeys); - - return 0; + return result; } int diff --git a/src/test/test_util.c b/src/test/test_util.c index a66941b..b7a69b2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2724,7 +2724,7 @@ test_util_join_win_cmdline(void *ptr) } done: - ; + tor_free(joined_argv); } #define MAX_SPLIT_LINE_COUNT 4

1 0

[tor/master] Fix a copy-and-paste issue found by coverity
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit b9432becbe0ff10788e8f289b6562720822b7ece Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 14:42:33 2013 -0500 Fix a copy-and-paste issue found by coverity Fixes CID 980650; bugfix on 0.2.4.10-alpha. --- changes/cov980650 | 4 ++++ src/or/routerset.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/cov980650 b/changes/cov980650 new file mode 100644 index 0000000..cbbada2 --- /dev/null +++ b/changes/cov980650 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a copy-and-paste error when adding a missing A1 to a routerset + because of GeoIPExcludeUnknown. Fix for coverity CID 980650. + Bugfix on 0.2.4.10-alpha. diff --git a/src/or/routerset.c b/src/or/routerset.c index e45516b..1eca5b6 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -255,7 +255,7 @@ routerset_add_unknown_ccs(routerset_t **setp, int only_if_some_cc_set) } if (add_a1) { smartlist_add(set->country_names, tor_strdup("a1")); - smartlist_add(set->country_names, tor_strdup("{a1}")); + smartlist_add(set->list, tor_strdup("{a1}")); } if (add_unknown || add_a1) {

1 0

[tor/master] Fix a very short-lived socket leak in tor-resolve
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 96b1bd4fb8e64503c5038a764ece46d950917f07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 15:13:42 2013 -0500 Fix a very short-lived socket leak in tor-resolve This shouldn't actually matter, since tor-resolve will return soon after this function exits, but it's nice to be warning-free Found by coverity, fixes CID 718633 --- src/tools/tor-resolve.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 2e4b97e..9b3aa98 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -4,7 +4,6 @@ /* See LICENSE for licensing information */ #include "orconfig.h" - #include "compat.h" #include "../common/util.h" #include "address.h" @@ -187,7 +186,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, int reverse, int version, tor_addr_t *result_addr, char **result_hostname) { - int s; + int s = -1; struct sockaddr_in socksaddr; char *req = NULL; ssize_t len = 0; @@ -202,7 +201,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, s = tor_open_socket(PF_INET,SOCK_STREAM,IPPROTO_TCP); if (s<0) { log_sock_error("creating_socket", -1); - return -1; + goto err; } memset(&socksaddr, 0, sizeof(socksaddr)); @@ -211,28 +210,28 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, socksaddr.sin_addr.s_addr = htonl(sockshost); if (connect(s, (struct sockaddr*)&socksaddr, sizeof(socksaddr))) { log_sock_error("connecting to SOCKS host", s); - return -1; + goto err; } if (version == 5) { char method_buf[2]; if (write_all(s, "\x05\x01\x00", 3, 1) != 3) { log_err(LD_NET, "Error sending SOCKS5 method list."); - return -1; + goto err; } if (read_all(s, method_buf, 2, 1) != 2) { log_err(LD_NET, "Error reading SOCKS5 methods."); - return -1; + goto err; } if (method_buf[0] != '\x05') { log_err(LD_NET, "Unrecognized socks version: %u", (unsigned)method_buf[0]); - return -1; + goto err; } if (method_buf[1] != '\x00') { log_err(LD_NET, "Unrecognized socks authentication method: %u", (unsigned)method_buf[1]); - return -1; + goto err; } } @@ -240,12 +239,12 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, version))<0) { log_err(LD_BUG,"Error generating SOCKS request"); tor_assert(!req); - return -1; + goto err; } if (write_all(s, req, len, 1) != len) { log_sock_error("sending SOCKS request", s); tor_free(req); - return -1; + goto err; } tor_free(req); @@ -253,22 +252,22 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, char reply_buf[RESPONSE_LEN_4]; if (read_all(s, reply_buf, RESPONSE_LEN_4, 1) != RESPONSE_LEN_4) { log_err(LD_NET, "Error reading SOCKS4 response."); - return -1; + goto err; } if (parse_socks4a_resolve_response(hostname, reply_buf, RESPONSE_LEN_4, result_addr)<0) { - return -1; + goto err; } } else { char reply_buf[16]; if (read_all(s, reply_buf, 4, 1) != 4) { log_err(LD_NET, "Error reading SOCKS5 response."); - return -1; + goto err; } if (reply_buf[0] != 5) { log_err(LD_NET, "Bad SOCKS5 reply version."); - return -1; + goto err; } /* Give a user some useful feedback about SOCKS5 errors */ if (reply_buf[1] != 0) { @@ -282,20 +281,20 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, "to Tor; we suggest an application that uses SOCKS 4a.", hostname); } - return -1; + goto err; } if (reply_buf[3] == 1) { /* IPv4 address */ if (read_all(s, reply_buf, 4, 1) != 4) { log_err(LD_NET, "Error reading address in socks5 response."); - return -1; + goto err; } tor_addr_from_ipv4n(result_addr, get_uint32(reply_buf)); } else if (reply_buf[3] == 4) { /* IPv6 address */ if (read_all(s, reply_buf, 16, 1) != 16) { log_err(LD_NET, "Error reading address in socks5 response."); - return -1; + goto err; } tor_addr_from_ipv6_bytes(result_addr, reply_buf); } else if (reply_buf[3] == 3) { @@ -303,19 +302,23 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport, size_t result_len; if (read_all(s, reply_buf, 1, 1) != 1) { log_err(LD_NET, "Error reading address_length in socks5 response."); - return -1; + goto err; } result_len = *(uint8_t*)(reply_buf); *result_hostname = tor_malloc(result_len+1); if (read_all(s, *result_hostname, result_len, 1) != (int) result_len) { log_err(LD_NET, "Error reading hostname in socks5 response."); - return -1; + goto err; } (*result_hostname)[result_len] = '\0'; } } + tor_close_socket(s); return 0; + err: + tor_close_socket(s); + return -1; } /** Print a usage message and exit. */

1 0