Merge branch '599-fix-a-shutdown-race-in-diagnostic-tools' into 'master'

Fix a shutdown race in bin/dig/dighost.c

Closes #599

See merge request isc-projects/bind9!855
This commit is contained in:
Michał Kępień
2018-11-13 08:25:11 -05:00
2 changed files with 8 additions and 0 deletions

View File

@@ -1,3 +1,6 @@
5088. [bug] dig/host/nslookup could crash when interrupted close to
a query timeout. [GL #599]
5087. [test] Check that result tables are complete. [GL #676]
5086. [func] Log of RPZ now includes the QTYPE and QCLASS. [GL #623]

View File

@@ -2902,6 +2902,11 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
INSIST(!free_now);
if (cancel_now) {
UNLOCK_LOOKUP;
return;
}
if ((query != NULL) && (query->lookup->current_query != NULL) &&
ISC_LINK_LINKED(query->lookup->current_query, link) &&
(ISC_LIST_NEXT(query->lookup->current_query, link) != NULL)) {