wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/ssl.c, src/internal.c: fix leak in wolfSSL_get_ciphers_compat(): fix gating (OPENSSL_EXTRA, not OPENSSL_ALL) in FreeSuites() re .suitesStack and .clSuitesStack, and similarly fix gating on the implementation of wolfSSL_sk_SSL_CIPHER_free(() and related.

Browse Source 
src/ssl_sess: suppress false positive clang-analyzer-unix.Malloc "Argument to 'free()' is the address of a global variable".
This commit is contained in:
Daniel Pouzzner
2025-02-28 15:23:43 -06:00
parent 7698546531
commit f7b911f5cd
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@@ -8379,7 +8379,7 @@ void FreeKeyExchange(WOLFSSL* ssl)
/* Free up all memory used by Suites structure from WOLFSSL */ /* Free up all memory used by Suites structure from WOLFSSL */
void FreeSuites(WOLFSSL* ssl) void FreeSuites(WOLFSSL* ssl)
{ {
#ifdef OPENSSL_ALL #ifdef OPENSSL_EXTRA
if (ssl->suitesStack != NULL) { if (ssl->suitesStack != NULL) {
/* Enough to free stack structure since WOLFSSL_CIPHER /* Enough to free stack structure since WOLFSSL_CIPHER
* isn't allocated separately. */ * isn't allocated separately. */
@@ -8392,8 +8392,6 @@ void FreeSuites(WOLFSSL* ssl)
wolfSSL_sk_SSL_CIPHER_free(ssl->clSuitesStack); wolfSSL_sk_SSL_CIPHER_free(ssl->clSuitesStack);
ssl->clSuitesStack = NULL; ssl->clSuitesStack = NULL;
} }
#endif
#ifdef OPENSSL_EXTRA
XFREE(ssl->clSuites, ssl->heap, DYNAMIC_TYPE_SUITES); XFREE(ssl->clSuites, ssl->heap, DYNAMIC_TYPE_SUITES);
ssl->clSuites = NULL; ssl->clSuites = NULL;
#endif #endif
@@ -25350,6 +25348,8 @@ int SendAsyncData(WOLFSSL* ssl)
*/ */
static int ssl_in_handshake(WOLFSSL *ssl, int send) static int ssl_in_handshake(WOLFSSL *ssl, int send)
{ {
int SendAsyncData = 1;
(void)SendAsyncData;
if (IsSCR(ssl)) { if (IsSCR(ssl)) {
if (send) { if (send) {
/* allow sending data in SCR */ /* allow sending data in SCR */

9
src/ssl.c
View File

@@ -21264,10 +21264,7 @@ void wolfSSL_print_all_errors_fp(XFILE fp)
/* Note: This is a huge section of API's - through /* Note: This is a huge section of API's - through
* wolfSSL_X509_OBJECT_get0_X509_CRL */ * wolfSSL_X509_OBJECT_get0_X509_CRL */
#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && \ #if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA)
(defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || \
defined(HAVE_LIGHTY) || defined(WOLFSSL_HAPROXY) || \
defined(WOLFSSL_OPENSSH) || defined(HAVE_SBLIM_SFCB)))
#if defined(USE_WOLFSSL_MEMORY) && !defined(WOLFSSL_DEBUG_MEMORY) && \ #if defined(USE_WOLFSSL_MEMORY) && !defined(WOLFSSL_DEBUG_MEMORY) && \
!defined(WOLFSSL_STATIC_MEMORY) !defined(WOLFSSL_STATIC_MEMORY)
@@ -21676,9 +21673,7 @@ void wolfSSL_THREADID_set_numeric(void* id, unsigned long val)
} }
#endif #endif
#endif /* OPENSSL_ALL || (OPENSSL_EXTRA && (HAVE_STUNNEL || WOLFSSL_NGINX || #endif /* OPENSSL_ALL || OPENSSL_EXTRA */
* HAVE_LIGHTY || WOLFSSL_HAPROXY || WOLFSSL_OPENSSH ||
* HAVE_SBLIM_SFCB)) */
#ifdef HAVE_SNI #ifdef HAVE_SNI

2
src/ssl_sess.c
View File

@@ -4097,7 +4097,7 @@ void wolfSSL_FreeSession(WOLFSSL_CTX* ctx, WOLFSSL_SESSION* session)
ForceZero(session->sessionID, ID_LEN); ForceZero(session->sessionID, ID_LEN);
if (session->type == WOLFSSL_SESSION_TYPE_HEAP) { if (session->type == WOLFSSL_SESSION_TYPE_HEAP) {
XFREE(session, session->heap, DYNAMIC_TYPE_SESSION); XFREE(session, session->heap, DYNAMIC_TYPE_SESSION); /* // NOLINT(clang-analyzer-unix.Malloc) */
} }
} }