From: Mark Andrews Date: Wed, 4 Nov 2020 04:20:13 +0000 (+1100) Subject: Incorrect result code passed to failed_connect_cb X-Git-Tag: v9.17.7~25^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0073cb73562f9101be7e8430bcaf3e1a21c7f10f;p=thirdparty%2Fbind9.git Incorrect result code passed to failed_connect_cb *** CID 312970: Incorrect expression (COPY_PASTE_ERROR) /lib/isc/netmgr/tcp.c: 282 in tcp_connect_cb() 276 } 277 278 isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]); 279 r = uv_tcp_getpeername(&sock->uv_handle.tcp, (struct sockaddr *)&ss, 280 &(int){ sizeof(ss) }); 281 if (r != 0) { >>> CID 312970: Incorrect expression (COPY_PASTE_ERROR) >>> "status" in "isc___nm_uverr2result(status, true, "netmgr/tcp.c", 282U)" looks like a copy-paste error. 282 failed_connect_cb(sock, req, isc__nm_uverr2result(status)); 283 return; 284 } 285 286 atomic_store(&sock->connecting, false); 287 --- diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index ce25a9d9207..d0e753e534b 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -279,7 +279,7 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) { r = uv_tcp_getpeername(&sock->uv_handle.tcp, (struct sockaddr *)&ss, &(int){ sizeof(ss) }); if (r != 0) { - failed_connect_cb(sock, req, isc__nm_uverr2result(status)); + failed_connect_cb(sock, req, isc__nm_uverr2result(r)); return; }