From e6b87c2e54e28830cf95d1c19105e959b6780ef6 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 24 Jan 2025 17:55:55 -0600 Subject: [PATCH] src/ssl.c: work around false positive from scan-build in wolfSSL_writev(), long ago annotated with PRAGMA_GCC("GCC diagnostic ignored \"-Wmaybe-uninitialized\""). wolfcrypt/src/misc.c: fix typo, max_size_t_() -> max_size_t(). --- src/ssl.c | 14 +++++++------- wolfcrypt/src/misc.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index c2eabbd8b..85527f443 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -3044,7 +3044,7 @@ int wolfSSL_write(WOLFSSL* ssl, const void* data, int sz) if (sz < 0) return BAD_FUNC_ARG; - return wolfSSL_write_internal(ssl, data, sz); + return wolfSSL_write_internal(ssl, data, (size_t)sz); } int wolfSSL_inject(WOLFSSL* ssl, const void* data, int sz) @@ -11328,7 +11328,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) #endif byte* myBuffer = staticBuffer; int dynamic = 0; - int sending = 0; + word32 sending = 0; int idx = 0; int i; int ret; @@ -11336,11 +11336,11 @@ int wolfSSL_set_compression(WOLFSSL* ssl) WOLFSSL_ENTER("wolfSSL_writev"); for (i = 0; i < iovcnt; i++) - sending += (int)iov[i].iov_len; + sending += iov[i].iov_len; - if (sending > (int)sizeof(staticBuffer)) { - myBuffer = (byte*)XMALLOC((size_t)sending, ssl->heap, - DYNAMIC_TYPE_WRITEV); + if (sending > sizeof(staticBuffer)) { + myBuffer = (byte*)XMALLOC(sending, ssl->heap, + DYNAMIC_TYPE_WRITEV); if (!myBuffer) return MEMORY_ERROR; @@ -11357,7 +11357,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) */ PRAGMA_GCC_DIAG_PUSH PRAGMA_GCC("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") - ret = wolfSSL_write(ssl, myBuffer, sending); + ret = wolfSSL_write_internal(ssl, myBuffer, sending); PRAGMA_GCC_DIAG_POP if (dynamic) diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c index 0cfb38c45..92d4bd302 100644 --- a/wolfcrypt/src/misc.c +++ b/wolfcrypt/src/misc.c @@ -535,7 +535,7 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b, } #endif /* !WOLFSSL_HAVE_MAX */ - WC_MISC_STATIC WC_INLINE size_t max_size_t_(size_t a, size_t b) + WC_MISC_STATIC WC_INLINE size_t max_size_t(size_t a, size_t b) { return a > b ? a : b; }