aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay/dns.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-03 21:34:43 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-03 21:34:43 -0500
commit98a1b8770cc6a52cd958d49882dbbadd6ae212f0 (patch)
tree86c0b202166126cf66e5aae38be2b3a07fe04bf1 /src/feature/relay/dns.c
parent7232f04939f44146254c21086178c62cce1d3392 (diff)
parentc75cf802d3061633bf0679ce8df33660a3be9345 (diff)
downloadtor-98a1b8770cc6a52cd958d49882dbbadd6ae212f0.tar.gz
tor-98a1b8770cc6a52cd958d49882dbbadd6ae212f0.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/feature/relay/dns.c')
-rw-r--r--src/feature/relay/dns.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 701719af95..5213296992 100644
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -586,8 +586,11 @@ send_resolved_hostname_cell,(edge_connection_t *conn,
char buf[RELAY_PAYLOAD_SIZE];
size_t buflen;
uint32_t ttl;
+
+ if (BUG(!hostname))
+ return;
+
size_t namelen = strlen(hostname);
- tor_assert(hostname);
tor_assert(namelen < 256);
ttl = dns_clip_ttl(conn->address_ttl);