From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 21 Dec 2024 10:25:29 +0000 (+0100)
Subject: openssl: avoid "redundant condition"
X-Git-Tag: curl-8_12_0~302
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5bd6246e44ff89f2462dd67769e3f603b246132;p=thirdparty%2Fcurl.git

openssl: avoid "redundant condition"

Pointed out by CodeSonar

Closes #15792
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index babb88fd97..cd59254101 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2922,16 +2922,13 @@ out:
  */
 static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid)
 {
-  struct Curl_cfilter *cf;
-  struct Curl_easy *data;
-  struct ssl_connect_data *connssl;
-
-  cf = (struct Curl_cfilter*) SSL_get_app_data(ssl);
-  connssl = cf ? cf->ctx : NULL;
-  data = connssl ? CF_DATA_CURRENT(cf) : NULL;
-  if(data && connssl)
+  struct Curl_cfilter *cf = (struct Curl_cfilter*) SSL_get_app_data(ssl);
+  if(cf) {
+    struct Curl_easy *data = CF_DATA_CURRENT(cf);
+    struct ssl_connect_data *connssl = cf->ctx;
     Curl_ossl_add_session(cf, data, connssl->peer.scache_key, ssl_sessionid,
                           SSL_version(ssl), connssl->negotiated.alpn);
+  }
   return 0;
 }