From: MAntoniak <47522782+MAntoniak@users.noreply.github.com>
Date: Mon, 21 Feb 2022 17:44:58 +0000 (+0100)
Subject: vtls: fix socket check conditions
X-Git-Tag: curl-7_82_0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9e79622d0a92d1593aa4aec8203d610498d9ea9;p=thirdparty%2Fcurl.git

vtls: fix socket check conditions

fix condition to check the second socket during associate and
disassociate connection

Closes #8493
---

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index bf7a9a1e92..03b85ba065 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -630,7 +630,8 @@ void Curl_ssl_associate_conn(struct Curl_easy *data,
 {
   if(Curl_ssl->associate_connection) {
     Curl_ssl->associate_connection(data, conn, FIRSTSOCKET);
-    if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted)
+    if((conn->sock[SECONDARYSOCKET] != CURL_SOCKET_BAD) &&
+       conn->bits.sock_accepted)
       Curl_ssl->associate_connection(data, conn, SECONDARYSOCKET);
   }
 }
@@ -640,7 +641,8 @@ void Curl_ssl_detach_conn(struct Curl_easy *data,
 {
   if(Curl_ssl->disassociate_connection) {
     Curl_ssl->disassociate_connection(data, FIRSTSOCKET);
-    if(conn->sock[SECONDARYSOCKET] && conn->bits.sock_accepted)
+    if((conn->sock[SECONDARYSOCKET] != CURL_SOCKET_BAD) &&
+       conn->bits.sock_accepted)
       Curl_ssl->disassociate_connection(data, SECONDARYSOCKET);
   }
 }