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

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

Browse source 
fix race in socket code

See merge request isc-projects/bind9!1672
This commit is contained in:
Evan Hunt 2019-03-12 16:10:22 -04:00
commit 84910c0920
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]
5180. [bug] delv now honors the operating system's preferred
ephemeral port range. [GL #925]

3
lib/dns/resolver.c
View file

@ -1323,7 +1323,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.
*/