* Port [3700] to 1.2.15

 * Fix segfault from receiving from non-recursive dns servers. (fixes #401)



svn: 3701

doc/UPDATES

@@ -18,6 +18,7 @@
 * Make the 'detect login' use less shell resources
 * Fix bot hosts/users being cached internally as wrong, even when a new host is added
 * Fix segfault in cmd_mmode (fixes #399)
+* Fix segfault from receiving from non-recursive dns servers. (fixes #401)
 
 1.2.14 - http://wraith.botpack.net/milestone/1.2.14
 * Fix another bug in shell functions. (fixes #321)

src/adns.c

@@ -897,11 +897,10 @@ static int parse_reply(char *response, size_t nbytes)
 
 		ptr += reply.rdlength;
 	}
-	q->remaining--;
 	/* Don't continue if we haven't gotten all expected replies. */
-	if (q->remaining > 0) return 0;
+	if (--q->remaining > 0) return 0;
 
-        if (!q->answers) {
+        if (q->answer.len == 0) {
           sdprintf("Failed to get any answers for query");
 
           if (prev) prev->next = q->next;