Merge remote-tracking branch 'origin/patches-2.0'

Hotant-Bu · Feb 16, 2012 · a63ed16 · a63ed16
2 parents a37cbfd + bec5068
commit a63ed16
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/evdns.c b/evdns.c
@@ -898,7 +898,12 @@ reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply)
 				    addrbuf, sizeof(addrbuf)));
 			break;
 		default:
-			/* we got a good reply from the nameserver */
+			/* we got a good reply from the nameserver: it is up. */
+			if (req->handle == req->ns->probe_request) {
+				/* Avoid double-free */
+				req->ns->probe_request = NULL;
+			}
+
 			nameserver_up(req->ns);
 		}