diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-01-27 05:15:53 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-01-27 05:15:53 +0000 |
| commit | 152547be49931c168b2dfc3c3622b1e432d54eb5 (patch) | |
| tree | 4a43f6f621ccda61181866dfb013c7ee2500ca89 | |
| parent | c66fbb002f687490681f9d85bf540a62a5535e64 (diff) | |
| download | tor-152547be49931c168b2dfc3c3622b1e432d54eb5.tar tor-152547be49931c168b2dfc3c3622b1e432d54eb5.tar.gz | |
r11548@catbus: nickm | 2007-01-27 00:15:47 -0500
Fix two assert bugs encountered when trying ipv6 lookups with eventdns code.
svn:r9430
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/or/eventdns.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -41,7 +41,7 @@ Changes in version 0.1.2.7-alpha - 2007-01-26 an incorrect number of bytes. (Previously, we would ignore the extra bytes.) - Fix as-yet-unused reverse IPv6 lookup code so it sends nybbles - in the correct order. + in the correct order, and doesn't crash. - Free memory held in recently-completed DNS lookup attempts on exit. This was not a memory leak, but may have been hiding memory leaks. - Don't launch requests for descriptors unless we have networkstatuses diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 9d0f8f070..02b8c9a3e 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -669,6 +669,7 @@ reply_callback(struct request *const req, u32 ttl, u32 err, struct reply *reply) req->user_pointer); else req->user_callback(err, 0, 0, 0, NULL, req->user_pointer); + return; } assert(0); } @@ -2416,7 +2417,7 @@ search_make_new(const struct search_state *const state, int n, const char *const static int search_request_new(int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg) { - assert(type == TYPE_A); + assert(type == TYPE_A || type == TYPE_AAAA); if ( ((flags & DNS_QUERY_NO_SEARCH) == 0) && global_search_state && global_search_state->num_domains) { |