diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-03 21:34:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-03 21:34:35 -0500 |
| commit | c75cf802d3061633bf0679ce8df33660a3be9345 (patch) | |
| tree | 5b9c9babb670703880149d26a1c7f1d25015be3c | |
| parent | abdc6aede2187e3b77ccf2d9a91c9443dab2109e (diff) | |
| parent | 16199a54a2b3f5ce94c6ca4248cbf44448ba95ae (diff) | |
| download | tor-c75cf802d3061633bf0679ce8df33660a3be9345.tar.gz tor-c75cf802d3061633bf0679ce8df33660a3be9345.zip | |
Merge branch 'ticket28879' into maint-0.3.5
| -rw-r--r-- | changes/ticket28879 | 5 | ||||
| -rw-r--r-- | src/feature/relay/dns.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/ticket28879 b/changes/ticket28879 new file mode 100644 index 0000000000..126420f6ca --- /dev/null +++ b/changes/ticket28879 @@ -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. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index bc507d47f6..cc213ff8d6 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); |