From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 14 Nov 2022 10:14:45 +0000 (+0100)
Subject: Curl_closesocket: avoid using 'conn' if NULL
X-Git-Tag: curl-7_87_0~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1e090b89e5ba03f79a1a0f790ead4af60d2146d;p=thirdparty%2Fcurl.git

Curl_closesocket: avoid using 'conn' if NULL

... in debug-only code.

Reported by Coverity CID 1516896

Closes #9907
---

diff --git a/lib/connect.c b/lib/connect.c
index 8cb018edc3..fbb8e86ee4 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1472,8 +1472,9 @@ bool Curl_connalive(struct connectdata *conn)
 int Curl_closesocket(struct Curl_easy *data, struct connectdata *conn,
                      curl_socket_t sock)
 {
-  DEBUGF(infof(data, "Curl_closesocket(conn #%ld, sock=%d), fclosesocket=%d",
-         conn->connection_id, (int)sock, conn->fclosesocket));
+  DEBUGF(infof(data, "Curl_closesocket(conn #%ld, sock=%d), fclosesocket=%p",
+               conn ? conn->connection_id : -1,
+               (int)sock, conn ? conn->fclosesocket : NULL));
   if(conn && conn->fclosesocket) {
     if((sock == conn->sock[SECONDARYSOCKET]) && conn->bits.sock_accepted)
       /* if this socket matches the second socket, and that was created with