]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
fix duplicate dns_cancel_pending_resolve reported by Giorgos Pallas
authorRoger Dingledine <arma@torproject.org>
Tue, 4 Jan 2005 11:26:08 +0000 (11:26 +0000)
committerRoger Dingledine <arma@torproject.org>
Tue, 4 Jan 2005 11:26:08 +0000 (11:26 +0000)
svn:r3293

src/or/dns.c

index ac24de24331b77b9dcf183d2f4e22c2394623d28..e70b277c36ba0e65ca319e35058037445c23d667 100644 (file)
@@ -568,7 +568,10 @@ int connection_dns_finished_flushing(connection_t *conn) {
 int connection_dns_reached_eof(connection_t *conn) {
   log_fn(LOG_WARN,"Read eof. Worker died unexpectedly.");
   if (conn->state == DNSWORKER_STATE_BUSY) {
-    dns_cancel_pending_resolve(conn->address);
+    /* don't cancel the resolve here -- it would be cancelled in
+     * connection_about_to_close_connection(), since conn is still
+     * in state BUSY
+     */
     num_dnsworkers_busy--;
   }
   num_dnsworkers--;