]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Incorrect result code passed to failed_connect_cb
authorMark Andrews <marka@isc.org>
Wed, 4 Nov 2020 04:20:13 +0000 (15:20 +1100)
committerOndřej Surý <ondrej@isc.org>
Wed, 4 Nov 2020 21:58:05 +0000 (21:58 +0000)
    *** 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

lib/isc/netmgr/tcp.c

index ce25a9d92075b69822effd45b038f34359636f17..d0e753e534b28a7571f38f2390bef6e4d0fef336 100644 (file)
@@ -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;
        }