From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Oct 2016 16:52:34 +0000 (-0400)
Subject: Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR
X-Git-Tag: tor-0.2.9.5-alpha~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28870402376c52b32feaebfcbe190873218fb89;p=thirdparty%2Ftor.git

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.
---

diff --git a/changes/bug19869 b/changes/bug19869
new file mode 100644
index 0000000000..430048f161
--- /dev/null
+++ b/changes/bug19869
@@ -0,0 +1,4 @@
+  o Minor bugfixes (DNSPort):
+    - On DNSPort, stop logging a BUG warning on a failed hostname lookup.
+      Fixes bug 19869; bugfix on 0.2.9.1-alpha.
+
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;