mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

clean up some handle/client reference counting errors in error cases.

Browse Source 
We weren't consistent about who should unreference the handle in
case of network error. Make it consistent so that it's always the
client code responsibility to unreference the handle - either
in the callback or right away if send function failed and the callback
will never be called.
This commit is contained in:
Witold Kręcicki
2020-01-17 11:42:35 +01:00
parent dcc0835a3a
commit 8d6dc8613a
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ns/client.c
View File

@@ -381,8 +381,9 @@ ns_client_sendraw(ns_client_t *client, dns_message_t *message) {
r.base[1] = client->message->id & 0xff;
result = client_sendpkg(client, &buffer);
if (result == ISC_R_SUCCESS)
if (result == ISC_R_SUCCESS) {
return;
}
done:
if (client->tcpbuf != NULL) {
@@ -392,6 +393,7 @@ ns_client_sendraw(ns_client_t *client, dns_message_t *message) {
}
ns_client_drop(client, result);
isc_nmhandle_unref(client->handle);
}
void
@@ -596,6 +598,10 @@ ns_client_send(ns_client_t *client) {
isc_nmhandle_ref(client->handle);
result = client_sendpkg(client, &tcpbuffer);
if (result != ISC_R_SUCCESS) {
/* We won't get a callback to clean it up */
isc_nmhandle_unref(client->handle);
}
switch (isc_sockaddr_pf(&client->peeraddr)) {
case AF_INET:
@@ -629,6 +635,10 @@ ns_client_send(ns_client_t *client) {
isc_nmhandle_ref(client->handle);
result = client_sendpkg(client, &buffer);
if (result != ISC_R_SUCCESS) {
/* We won't get a callback to clean it up */
isc_nmhandle_unref(client->handle);
}
switch (isc_sockaddr_pf(&client->peeraddr)) {
case AF_INET: