June 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 1930828957c9caeeeec165c9068f5898d092f268 Merge: e75583e71 c1add51bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[snowflake-mobile/master] Created a workable UI and created a service class
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 49c4d5c62078d3831d66bb159d9b164fad2e90ff Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 3 20:23:45 2020 +0530 Created a workable UI and created a service class --- .idea/misc.xml | 2 +- .../org/torproject/snowflake/MainActivity.java | 30 ++++++++++++++++++++++ .../torproject/snowflake/MyPersistentService.java | 16 ++++++++++++ app/src/main/res/layout/activity_main.xml | 10 ++++---- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..37a7509 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 31b77ff..240e285 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -2,7 +2,11 @@ package org.torproject.snowflake; import androidx.appcompat.app.AppCompatActivity; +import android.app.ActivityManager; +import android.content.Context; import android.os.Bundle; +import android.widget.Button; +import android.widget.Toast; public class MainActivity extends AppCompatActivity { @@ -10,5 +14,31 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + Button startButton = findViewById(R.id.start_button); + + startButton.setOnClickListener(v -> { + if (isServiceRunning()){ //Toggling the service. + //TODO: Start service + } + else{ + //TODO: Stop service + } + }); + if (BuildConfig.DEBUG) + startButton.performClick(); //To perform an automatic click in testing environment. + } + + //Test to see if the service is already running. + private boolean isServiceRunning() { + ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); + if (manager != null) { + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + if (MyPersistentService.class.getName().equals(service.service.getClassName())) { + return true; + } + } + } + return false; } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java new file mode 100644 index 0000000..cc4806d --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -0,0 +1,16 @@ +package org.torproject.snowflake; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +import androidx.annotation.Nullable; + +//Main foreground service to handle network calls and to relay the data in the back ground. +public class MyPersistentService extends Service { + @Nullable + @Override + public IBinder onBind(Intent intent) { + return null; + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4fc2444..1c42128 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,13 +6,13 @@ android:layout_height="match_parent" tools:context=".MainActivity"> - <TextView + <Button + android:id="@+id/start_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Hello World!" + android:text="Service Toggle" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1920/head'
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit f548f1475bee7d85629be4411e09d05836eba942 Merge: 1fb9be539 5ba7d494c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 10:12:00 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1920/head' .gitignore | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] Remove tor.sh from .gitignore
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 5ba7d494c5618a1bd546902db1a49479b7b55b86 Author: c <c(a)chroniko.jp> Date: Fri Jun 5 10:28:29 2020 +0000 Remove tor.sh from .gitignore The files contrib/dist/tor.sh and contrib/dist/suse/tor.sh should not exist anymore, but when building in same repository for older versions of Tor, these files may return and not be cleaned up properly. This commit unignores those files from .gitignore, in order to make it clear that these files are no longer auto-generated and should be cleaned up. --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index ea6b68ec5..97b145590 100644 --- a/.gitignore +++ b/.gitignore @@ -79,11 +79,9 @@ uptime-*.json /callgraph/ # /contrib/ -/contrib/dist/tor.sh /contrib/dist/torctl /contrib/dist/tor.service /contrib/operator-tools/tor.logrotate -/contrib/dist/suse/tor.sh # /debian/ /debian/files

1 0

[tor/master] Tweak format string
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 7a004fce8d375b7c89703a3292634af4a221691a Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Thu May 21 14:26:08 2020 +0300 Tweak format string --- src/lib/net/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index b24fe6c91..d99a1795f 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -2018,7 +2018,7 @@ tor_dup_ip(uint32_t addr) in.s_addr = htonl(addr); ip_str = tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); - tor_assertf_nonfatal(ip_str, "Failed to duplicate IP %04X", addr); + tor_assertf_nonfatal(ip_str, "Failed to duplicate IP %08X", addr); if (ip_str) return tor_strdup(buf);

1 0

[tor/master] Check for NULL from tor_dup_ip()
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit a5d28bf88f839c21fbefde8391d777fd9610abd3 Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Thu May 21 14:17:15 2020 +0300 Check for NULL from tor_dup_ip() --- src/app/config/resolve_addr.c | 2 +- src/core/or/connection_edge.c | 5 ++-- src/feature/client/circpathbias.c | 5 ++++ src/feature/control/control_getinfo.c | 1 + src/feature/dirauth/dirvote.c | 5 ++++ src/feature/nodelist/authcert.c | 12 ++++++---- src/feature/nodelist/dirlist.c | 3 +++ src/feature/relay/relay_periodic.c | 43 +++++++++++++++++++---------------- src/feature/relay/router.c | 3 +++ src/feature/relay/selftest.c | 12 ++++++++++ src/feature/rend/rendservice.c | 25 +++++++++++--------- 11 files changed, 78 insertions(+), 38 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index b551615c0..aa978e230 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -192,7 +192,7 @@ resolve_my_address(int warn_severity, const or_options_t *options, tor_addr_from_ipv4h(&myaddr,addr); addr_string = tor_dup_ip(addr); - if (tor_addr_is_internal(&myaddr, 0)) { + if (addr_string && tor_addr_is_internal(&myaddr, 0)) { /* make sure we're ok with publishing an internal IP */ if (using_default_dir_authorities(options)) { /* if they are using the default authorities, disallow internal IPs diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 5c9bf64e8..fc77db833 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -3459,8 +3459,9 @@ tell_controller_about_resolved_result(entry_connection_t *conn, expires = time(NULL) + ttl; if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); - control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL, 0); + if (cp) + control_event_address_mapped(conn->socks_request->address, + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c index 4ac5cb8fc..74260171f 100644 --- a/src/feature/client/circpathbias.c +++ b/src/feature/client/circpathbias.c @@ -826,6 +826,11 @@ pathbias_send_usable_probe(circuit_t *circ) ocirc->pathbias_probe_nonce &= 0x00ffffff; probe_nonce = tor_dup_ip(ocirc->pathbias_probe_nonce); + if (!probe_nonce) { + log_err(LD_BUG, "Failed to generate nonce"); + return -1; + } + tor_snprintf(payload,RELAY_PAYLOAD_SIZE, "%s:25", probe_nonce); payload_len = (int)strlen(payload)+1; diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 685deb8ec..3605c23dc 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -137,6 +137,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, return -1; } *answer = tor_dup_ip(addr); + tor_assert_nonfatal(*answer); } else if (!strcmp(question, "traffic/read")) { tor_asprintf(answer, "%"PRIu64, (get_bytes_read())); } else if (!strcmp(question, "traffic/written")) { diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 0a9ade132..85a23a12f 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4501,6 +4501,11 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, hostname = tor_dup_ip(addr); } + if (!hostname) { + log_err(LD_BUG, "Failed to determine hostname AND duplicate address"); + return NULL; + } + if (d_options->VersioningAuthoritativeDirectory) { client_versions = format_recommended_version_list(d_options->RecommendedClientVersions, 0); diff --git a/src/feature/nodelist/authcert.c b/src/feature/nodelist/authcert.c index 9c7525b6e..97e44d53e 100644 --- a/src/feature/nodelist/authcert.c +++ b/src/feature/nodelist/authcert.c @@ -464,11 +464,13 @@ trusted_dirs_load_certs_from_string(const char *contents, int source, (ds->addr != cert->addr || ds->dir_port != cert->dir_port)) { char *a = tor_dup_ip(cert->addr); - log_notice(LD_DIR, "Updating address for directory authority %s " - "from %s:%d to %s:%d based on certificate.", - ds->nickname, ds->address, (int)ds->dir_port, - a, cert->dir_port); - tor_free(a); + if (a) { + log_notice(LD_DIR, "Updating address for directory authority %s " + "from %s:%d to %s:%d based on certificate.", + ds->nickname, ds->address, (int)ds->dir_port, + a, cert->dir_port); + tor_free(a); + } ds->addr = cert->addr; ds->dir_port = cert->dir_port; } diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index d7069bb0e..33d1bfc4d 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -358,6 +358,9 @@ trusted_dir_server_new(const char *nickname, const char *address, } if (!hostname) hostname = tor_dup_ip(a); + + if (!hostname) + return NULL; } else { if (tor_lookup_hostname(address, &a)) { log_warn(LD_CONFIG, diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index b751323e0..08ad110cf 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -203,29 +203,34 @@ reachability_warnings_callback(time_t now, const or_options_t *options) const routerinfo_t *me = router_get_my_routerinfo(); if (me && !check_whether_orport_reachable(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " - "its ORPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->or_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED ORADDRESS=%s:%d", - address, me->or_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that " + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->or_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED ORADDRESS=%s:%d", + address, me->or_port); + tor_free(address); + } } if (me && !check_whether_dirport_reachable(options)) { char *address = tor_dup_ip(me->addr); - log_warn(LD_CONFIG, - "Your server (%s:%d) has not managed to confirm that its " - "DirPort is reachable. Relays do not publish descriptors " - "until their ORPort and DirPort are reachable. Please check " - "your firewalls, ports, address, /etc/hosts file, etc.", - address, me->dir_port); - control_event_server_status(LOG_WARN, - "REACHABILITY_FAILED DIRADDRESS=%s:%d", - address, me->dir_port); - tor_free(address); + if (address) { + log_warn(LD_CONFIG, + "Your server (%s:%d) has not managed to confirm that its " + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", + address, me->dir_port); + control_event_server_status(LOG_WARN, + "REACHABILITY_FAILED DIRADDRESS=%s:%d", + address, me->dir_port); + tor_free(address); + } } } diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 267dee848..34d8163c3 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2784,6 +2784,9 @@ router_dump_router_to_string(routerinfo_t *router, } address = tor_dup_ip(router->addr); + if (!address) + goto err; + chunks = smartlist_new(); /* Generate the easy portion of the router descriptor. */ diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 402ce0e3d..18fe25b98 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -224,7 +224,11 @@ inform_testing_reachability(void) const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; + address = tor_dup_ip(me->addr); + if (!address) + return 0; + control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY ORADDRESS=%s:%d", address, me->or_port); @@ -255,6 +259,10 @@ router_orport_found_reachable(void) const or_options_t *options = get_options(); if (!can_reach_or_port && me) { char *address = tor_dup_ip(me->addr); + + if (!address) + return; + log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO @@ -282,6 +290,10 @@ router_dirport_found_reachable(void) const or_options_t *options = get_options(); if (!can_reach_dir_port && me) { char *address = tor_dup_ip(me->addr); + + if (!address) + return; + log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " "from the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 9d7ff2d17..a88c2080f 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3715,20 +3715,23 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, base32_encode(desc_id_base32, sizeof(desc_id_base32), desc->desc_id, DIGEST_LEN); hs_dir_ip = tor_dup_ip(hs_dir->addr); - log_info(LD_REND, "Launching upload for v2 descriptor for " - "service '%s' with descriptor ID '%s' with validity " - "of %d seconds to hidden service directory '%s' on " - "%s:%d.", - safe_str_client(service_id), - safe_str_client(desc_id_base32), - seconds_valid, - hs_dir->nickname, - hs_dir_ip, - hs_dir->or_port); + if (hs_dir_ip) { + log_info(LD_REND, "Launching upload for v2 descriptor for " + "service '%s' with descriptor ID '%s' with validity " + "of %d seconds to hidden service directory '%s' on " + "%s:%d.", + safe_str_client(service_id), + safe_str_client(desc_id_base32), + seconds_valid, + hs_dir->nickname, + hs_dir_ip, + hs_dir->or_port); + tor_free(hs_dir_ip); + } + control_event_hs_descriptor_upload(service_id, hs_dir->identity_digest, desc_id_base32, NULL); - tor_free(hs_dir_ip); /* Remember successful upload to this router for next time. */ if (!smartlist_contains_digest(successful_uploads, hs_dir->identity_digest))

1 0

[tor/master] Fix some checks of tor_inet_ntoa() return value
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 3e4814edeb563535b0f3bf658c01d7c10d6b4aa2 Author: rl1987 <rl1987(a)users.noreply.github.com> Date: Fri Jun 5 11:49:24 2020 +0300 Fix some checks of tor_inet_ntoa() return value Also, fix a format string. --- src/feature/relay/dns.c | 2 +- src/lib/net/address.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 26e9c6bf1..b83bd9b75 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1881,7 +1881,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl, int ntoa_res; in.s_addr = addrs[i]; ntoa_res = tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf)); - tor_assert_nonfatal(ntoa_res > 0); + tor_assert_nonfatal(ntoa_res >= 0); if (ntoa_res > 0) wildcard_increment_answer(answer_buf); } diff --git a/src/lib/net/address.c b/src/lib/net/address.c index d99a1795f..567048b5a 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1207,10 +1207,10 @@ fmt_addr32(uint32_t addr) in.s_addr = htonl(addr); success = tor_inet_ntoa(&in, buf, sizeof(buf)); - tor_assertf_nonfatal(success > 0, - "Failed to convert IP %04X to string", addr); + tor_assertf_nonfatal(success >= 0, + "Failed to convert IP 0x%08X (HBO) to string", addr); - if (success <= 0) { + IF_BUG_ONCE(success < 0) { memset(buf, 0, INET_NTOA_BUF_LEN); }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1902/head'
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 1fb9be53969011a10c453a36099583f631dc8a09 Merge: b335ef178 3e4814ede Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 10:08:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1902/head' changes/ticket33788 | 4 ++ src/app/config/resolve_addr.c | 2 +- src/core/or/connection_edge.c | 5 +- src/feature/client/circpathbias.c | 5 ++ src/feature/control/control_getinfo.c | 1 + src/feature/dirauth/dirvote.c | 86 +++++++++++++++++++-------------- src/feature/nodelist/authcert.c | 12 +++-- src/feature/nodelist/dirlist.c | 3 ++ src/feature/nodelist/fmt_routerstatus.c | 6 ++- src/feature/relay/dns.c | 24 ++++++--- src/feature/relay/relay_periodic.c | 43 +++++++++-------- src/feature/relay/router.c | 3 ++ src/feature/relay/selftest.c | 12 +++++ src/feature/rend/rendservice.c | 25 +++++----- src/lib/net/address.c | 27 +++++++++-- 15 files changed, 171 insertions(+), 87 deletions(-)

1 0

[tor/master] Bail out of format_networkstatus_vote if fmt_addr32() failed.
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit ded99992b831bfff782a3b3c612297a4634d3d88 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 20:01:21 2020 +0300 Bail out of format_networkstatus_vote if fmt_addr32() failed. Something is fishy if we cannot put IP address string into dir-vote line. --- src/feature/dirauth/dirvote.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index c8b4637e6..0a9ade132 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -372,6 +372,9 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, tor_free(bw_headers_line); tor_free(bw_file_digest); + if (ip_str[0] == '\0') + goto err; + if (!tor_digest_is_zero(voter->legacy_id_digest)) { char fpbuf[HEX_DIGEST_LEN+1]; base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN);

1 0

[tor/master] Check for possible failures of tor_inet_ntop/tor_inet_ntoa in fmt_addr32 and tor_dup_ip
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit d8e24684b6607baa95dd4950a14ea671edcef1dc Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 8 18:33:18 2020 +0300 Check for possible failures of tor_inet_ntop/tor_inet_ntoa in fmt_addr32 and tor_dup_ip --- src/lib/net/address.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index b8f5f3774..b24fe6c91 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -1196,14 +1196,24 @@ fmt_addrport(const tor_addr_t *addr, uint16_t port) /** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4 * addresses. Also not thread-safe, also clobbers its return buffer on - * repeated calls. */ + * repeated calls. Clean internal buffer and return empty string on failure. */ const char * fmt_addr32(uint32_t addr) { static char buf[INET_NTOA_BUF_LEN]; struct in_addr in; + int success; + in.s_addr = htonl(addr); - tor_inet_ntoa(&in, buf, sizeof(buf)); + + success = tor_inet_ntoa(&in, buf, sizeof(buf)); + tor_assertf_nonfatal(success > 0, + "Failed to convert IP %04X to string", addr); + + if (success <= 0) { + memset(buf, 0, INET_NTOA_BUF_LEN); + } + return buf; } @@ -1995,17 +2005,24 @@ parse_port_range(const char *port, uint16_t *port_min_out, } /** Given a host-order <b>addr</b>, call tor_inet_ntop() on it - * and return a strdup of the resulting address. + * and return a strdup of the resulting address. Return NULL if + * tor_inet_ntop() fails. */ char * tor_dup_ip(uint32_t addr) { + const char *ip_str; char buf[TOR_ADDR_BUF_LEN]; struct in_addr in; in.s_addr = htonl(addr); - tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); - return tor_strdup(buf); + ip_str = tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); + + tor_assertf_nonfatal(ip_str, "Failed to duplicate IP %04X", addr); + if (ip_str) + return tor_strdup(buf); + + return NULL; } /**

1 0