upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 14:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
the view's allow-transfer ACL should be used to
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_SOCKCANCEL_CONNECT);
}
} else if (RESQUERY_SENDING(query)) {
}
if (RESQUERY_SENDING(query)) {
/*
* Cancel the pending send.
*/