feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5062 from dgarske/clang_str

Browse Source 
Fix for issue with `error: format string is not a string literal`
This commit is contained in:
Daniel Pouzzner
2022-04-19 14:27:36 -05:00
committed by GitHub
parent 52b176b6a1 95a85d16d2
commit 5d0654ee56
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bio.c
View File

@ -2866,6 +2866,10 @@ void *wolfSSL_BIO_get_ex_data(WOLFSSL_BIO *bio, int idx)
#if defined(OPENSSL_EXTRA) #if defined(OPENSSL_EXTRA)
/* returns amount printed on success, negative in fail case */ /* returns amount printed on success, negative in fail case */
#ifdef __clang__
/* tell clang argument 2 is format */
__attribute__((__format__ (__printf__, 2, 0)))
#endif
int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args) int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
{ {
int ret = -1; int ret = -1;
@ -2929,6 +2933,10 @@ int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
} }
/* returns amount printed on success, negative in fail case */ /* returns amount printed on success, negative in fail case */
#ifdef __clang__
/* tell clang argument 2 is format */
__attribute__((__format__ (__printf__, 2, 0)))
#endif
int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...) int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...)
{ {
int ret; int ret;

2
src/x509.c
View File

@ -4276,7 +4276,7 @@ int wolfSSL_GENERAL_NAME_print(WOLFSSL_BIO* out, WOLFSSL_GENERAL_NAME* gen)
ret = wolfSSL_BIO_printf(out, "DNS:"); ret = wolfSSL_BIO_printf(out, "DNS:");
ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE; ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE;
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
ret = wolfSSL_BIO_printf(out, gen->d.dNSName->strData); ret = wolfSSL_BIO_printf(out, "%s", gen->d.dNSName->strData);
ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE; ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE;
} }
break; break;