[tor-commits] [tor/release-0.2.9] Avoid tor_fragile_assert() failure with DNSPort on RESOLVED_TYPE_ERROR

[nickm at torproject.org]

commit d28870402376c52b32feaebfcbe190873218fb89
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 26 12:52:34 2016 -0400

    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.
---
 changes/bug19869 | 4 ++++
 src/or/dnsserv.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/changes/bug19869 b/changes/bug19869
new file mode 100644
index 0000000..430048f
--- /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 04be3e8..f5a4f2a 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;