From: Andrew Dinh <andrewd@openssl.org>
Date: Wed, 19 Feb 2025 06:41:03 +0000 (+0700)
Subject: ssl_lib.c: Check for NULL from SSL_CONNECTION_FROM_SSL()
X-Git-Tag: openssl-3.5.0-alpha1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1c6e2d1b590dc6a3d2e1c7bd1bf61ffcf854104;p=thirdparty%2Fopenssl.git

ssl_lib.c: Check for NULL from SSL_CONNECTION_FROM_SSL()

Fixes https://scan5.scan.coverity.com/#/project-view/62507/10222?selectedIssue=1643027
Fixes https://scan5.scan.coverity.com/#/project-view/62507/10222?selectedIssue=1643028

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26824)
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 4307f020311..f1c679083fb 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -8226,6 +8226,9 @@ int SSL_set1_client_cert_type(SSL *s, const unsigned char *val, size_t len)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
+    if (sc == NULL)
+        return 0;
+
     return set_cert_type(&sc->client_cert_type, &sc->client_cert_type_len,
                          val, len);
 }
@@ -8234,6 +8237,9 @@ int SSL_set1_server_cert_type(SSL *s, const unsigned char *val, size_t len)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
+    if (sc == NULL)
+        return 0;
+
     return set_cert_type(&sc->server_cert_type, &sc->server_cert_type_len,
                          val, len);
 }