mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '834-fix-race-in-fctx-cancel' into 'master'

Browse Source 
fix race in socket code

Closes #834

See merge request isc-projects/bind9!1671
This commit is contained in:
Evan Hunt 2019-03-12 14:35:57 -04:00
commit 44c8202b0c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
5182. [bug] Fix a high-load race/crash in handling of
isc_socket_close() in resolver. [GL #834]
5181. [func] Add a mechanism for a DLZ module to signal that 5181. [func] Add a mechanism for a DLZ module to signal that
the view's allow-transfer ACL should be used to the view's allow-transfer ACL should be used to
determine whether transfers are allowed. [GL #803] determine whether transfers are allowed. [GL #803]

3
lib/dns/resolver.c
View File

@ -1321,7 +1321,8 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
isc_socket_cancel(sock, NULL, isc_socket_cancel(sock, NULL,
ISC_SOCKCANCEL_CONNECT); ISC_SOCKCANCEL_CONNECT);
} }
} else if (RESQUERY_SENDING(query)) { }
if (RESQUERY_SENDING(query)) {
/* /*
* Cancel the pending send. * Cancel the pending send.
*/ */