From d28870402376c52b32feaebfcbe190873218fb89 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 26 Oct 2016 12:52:34 -0400 Subject: Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR The tor_fragile_assert() bug has existed here since c8a5e2d588e0d91 in tor-0.2.1.7-alpha forever, but tor_fragile_assert() was mostly a no-op until 0.2.9.1-alpha. Fixes bug 19869. --- src/or/dnsserv.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/or/dnsserv.c') diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 04be3e8a6a..f5a4f2ac0f 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -290,6 +290,10 @@ evdns_get_orig_address(const struct evdns_server_request *req, case RESOLVED_TYPE_IPV6: type = EVDNS_TYPE_AAAA; break; + case RESOLVED_TYPE_ERROR: + case RESOLVED_TYPE_ERROR_TRANSIENT: + /* Addr doesn't matter, since we're not sending it back in the reply.*/ + return addr; default: tor_fragile_assert(); return addr; -- cgit v1.2.3-54-g00ecf