wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix nigtly jenkins Qt Job failure

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-12-02 16:37:48 +09:00
parent b69a1c860c
commit a5bd6cde8d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ssl.c
View File

@ -30939,11 +30939,20 @@ void wolfSSL_sk_pop_free(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk,
WOLFSSL_MSG("Error, BAD_FUNC_ARG"); WOLFSSL_MSG("Error, BAD_FUNC_ARG");
return; return;
} }
#if defined(WOLFSSL_QT)
/* In Qt v15.5, it calls OPENSSL_sk_free(xxx, OPENSSL_sk_free).
* By using OPENSSL_sk_free for free causes access violation.
* Therefore, switching free func to wolfSSL_ACCESS_DESCRIPTION_free
* is needed even the func isn't NULL.
*/
if (sk->type == STACK_TYPE_ACCESS_DESCRIPTION) {
func = (wolfSSL_sk_freefunc)wolfSSL_ACCESS_DESCRIPTION_free;
}
#endif
if (func == NULL) { if (func == NULL) {
switch(sk->type) { switch(sk->type) {
case STACK_TYPE_ACCESS_DESCRIPTION: case STACK_TYPE_ACCESS_DESCRIPTION:
#if defined(OPENSSL_ALL) || defined (WOLFSSL_QT) #if defined(OPENSSL_ALL)
func = (wolfSSL_sk_freefunc)wolfSSL_ACCESS_DESCRIPTION_free; func = (wolfSSL_sk_freefunc)wolfSSL_ACCESS_DESCRIPTION_free;
#endif #endif
break; break;