diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:10:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:10:14 -0500 |
| commit | 9d133464c874191414dd51f546d09364419040cf (patch) | |
| tree | 4f5aa2377c7ef93a9d9ee36a045bb4ac869b289a | |
| parent | 6def56848dfe6cbf2ad1d904c937a9818f5d80a8 (diff) | |
| parent | 31b562e10abe51cf9d520e0a3ad2ffc3277d52a4 (diff) | |
| download | tor-9d133464c874191414dd51f546d09364419040cf.tar.gz tor-9d133464c874191414dd51f546d09364419040cf.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
| -rw-r--r-- | src/or/dnsserv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index d5faffb2c3..8222c8b45d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -282,6 +282,7 @@ dnsserv_resolved(edge_connection_t *conn, name, 1, (char*)answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && + answer_len < 256 && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); evdns_server_request_add_ptr_reply(req, NULL, |