]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Address use before NULL check warning of uvreq
authorMark Andrews <marka@isc.org>
Tue, 28 Sep 2021 00:08:26 +0000 (10:08 +1000)
committerMark Andrews <marka@isc.org>
Tue, 28 Sep 2021 01:57:47 +0000 (11:57 +1000)
move dereference of uvreq until the after NULL check.

lib/isc/netmgr/netmgr.c

index a74047d763d8262c5076cf4843a0d86794f8609d..6f10061fcd90a4e29c9daf285c42880e62c65465 100644 (file)
@@ -2730,8 +2730,7 @@ isc__nm_async_readcb(isc__networker_t *worker, isc__netievent_t *ev0) {
        isc_nmsocket_t *sock = ievent->sock;
        isc__nm_uvreq_t *uvreq = ievent->req;
        isc_result_t eresult = ievent->result;
-       isc_region_t region = { .base = (unsigned char *)uvreq->uvbuf.base,
-                               .length = uvreq->uvbuf.len };
+       isc_region_t region;
 
        UNUSED(worker);
 
@@ -2740,6 +2739,9 @@ isc__nm_async_readcb(isc__networker_t *worker, isc__netievent_t *ev0) {
        REQUIRE(VALID_NMHANDLE(uvreq->handle));
        REQUIRE(sock->tid == isc_nm_tid());
 
+       region.base = (unsigned char *)uvreq->uvbuf.base;
+       region.length = uvreq->uvbuf.len;
+
        uvreq->cb.recv(uvreq->handle, eresult, &region, uvreq->cbarg);
 
        isc__nm_uvreq_put(&uvreq, sock);