]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
ensure fd is non-negative before calling dup()
authorEvan Hunt <each@isc.org>
Wed, 21 Aug 2024 19:27:16 +0000 (12:27 -0700)
committerEvan Hunt <each@isc.org>
Thu, 22 Aug 2024 04:37:51 +0000 (21:37 -0700)
this silences a spurious warning from clang-scan 19.

lib/isc/netmgr/tcp.c
lib/isc/netmgr/tcpdns.c
lib/isc/netmgr/tlsdns.c
lib/isc/netmgr/udp.c

index 37d44bd9c846a3334eed1eba1b483f429f73e028..7c77b6cb744522f4a6be825fee1822431a2372a7 100644 (file)
@@ -424,9 +424,10 @@ start_tcp_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
                csock->fd = isc__nm_tcp_lb_socket(mgr,
                                                  iface->type.sa.sa_family);
        } else {
+               INSIST(fd >= 0);
                csock->fd = dup(fd);
        }
-       REQUIRE(csock->fd >= 0);
+       INSIST(csock->fd >= 0);
 
        ievent = isc__nm_get_netievent_tcplisten(mgr, csock);
        isc__nm_maybe_enqueue_ievent(&mgr->workers[tid],
index 4b5ee58b6a59e3e9ff753ef0f8851254884dd2f7..6ce4a61e686adf6386078c053100ec43a253dd86 100644 (file)
@@ -397,9 +397,10 @@ start_tcpdns_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
                csock->fd = isc__nm_tcpdns_lb_socket(mgr,
                                                     iface->type.sa.sa_family);
        } else {
+               INSIST(fd >= 0);
                csock->fd = dup(fd);
        }
-       REQUIRE(csock->fd >= 0);
+       INSIST(csock->fd >= 0);
 
        ievent = isc__nm_get_netievent_tcpdnslisten(mgr, csock);
        isc__nm_maybe_enqueue_ievent(&mgr->workers[tid],
index dcec05347f787460033b453d52ba01f937707a23..b56e0682b1fee4bda358c3527f9ca562280d35ca 100644 (file)
@@ -501,9 +501,10 @@ start_tlsdns_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
                csock->fd = isc__nm_tlsdns_lb_socket(mgr,
                                                     iface->type.sa.sa_family);
        } else {
+               INSIST(fd >= 0);
                csock->fd = dup(fd);
        }
-       REQUIRE(csock->fd >= 0);
+       INSIST(csock->fd >= 0);
 
        ievent = isc__nm_get_netievent_tlsdnslisten(mgr, csock);
        isc__nm_maybe_enqueue_ievent(&mgr->workers[tid],
index 661de96ac69567d5883a9d00591e2470617da955..1956a185ef03bd52eb9af4fbcde203a6958a44c2 100644 (file)
@@ -129,9 +129,10 @@ start_udp_child(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nmsocket_t *sock,
                csock->fd = isc__nm_udp_lb_socket(mgr,
                                                  iface->type.sa.sa_family);
        } else {
+               INSIST(fd >= 0);
                csock->fd = dup(fd);
        }
-       REQUIRE(csock->fd >= 0);
+       INSIST(csock->fd >= 0);
 
        ievent = isc__nm_get_netievent_udplisten(mgr, csock);
        isc__nm_maybe_enqueue_ievent(&mgr->workers[tid],