summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-09-15 15:03:41 +0200
committerSergei Golubchik <serg@mariadb.org>2017-09-18 10:12:23 +0200
commit203e2176fe046f9cdbf6bc46be03ef2c1a670f91 (patch)
treed8b8ca570cf22138cc044d7ef7e0d3bb28590751
parent50a8beedfe59f97d381e8f506344a6197b8b5702 (diff)
downloadmariadb-git-203e2176fe046f9cdbf6bc46be03ef2c1a670f91.tar.gz
MDEV-13698 stack overflow (OpenSSL on Windows)
avoid CRYPTO_free recursively calling itself on Windows
-rw-r--r--mysys_ssl/openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
index 34f4d629ba6..3f841eec92f 100644
--- a/mysys_ssl/openssl.c
+++ b/mysys_ssl/openssl.c
@@ -50,7 +50,7 @@ int check_openssl_compatibility()
EVP_CIPHER_CTX *evp_ctx;
EVP_MD_CTX *md5_ctx;
- if (!CRYPTO_set_mem_functions(coc_malloc, CRYPTO_realloc, CRYPTO_free))
+ if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL))
return 1;
testing= 1;