mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Merge branch 'maint-0.3.5'

Browse Source
This commit is contained in:
Nick Mathewson 2019-01-03 21:34:43 -05:00
commit 98a1b8770c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket28879 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (correctness):
- Fix an unreached code-path where we checked the value of "hostname"
inside send_resolved_hostnam_cell(). Previously, we used it before
checking it; now we check it first. Fixes bug 28879; bugfix on
0.1.2.7-alpha.

5
src/feature/relay/dns.c
View File

@ -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);