1 files changed, 3 insertions, 4 deletions

diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c
index 21c0011380..9ecb8d26b1 100644
--- a/src/lib/libcrypto/mem.c
+++ b/src/lib/libcrypto/mem.c
@@ -125,7 +125,6 @@ static long (*get_debug_options_func)(void) = NULL;
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
         void (*f)(void *))
         {
-        OPENSSL_init();
         if (!allow_customize)
                 return 0;
         if ((m == 0) || (r == 0) || (f == 0))
@@ -187,7 +186,6 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
         {
         if (!allow_customize_debug)
                 return 0;
-        OPENSSL_init();
         malloc_debug_func=m;
         realloc_debug_func=r;
         free_debug_func=f;
@@ -326,9 +324,10 @@ void *CRYPTO_malloc(int num, const char *file, int line)
         }
 char *CRYPTO_strdup(const char *str, const char *file, int line)
         {
-        char *ret = CRYPTO_malloc(strlen(str)+1, file, line);
+        size_t len = strlen(str)+1;
+        char *ret = CRYPTO_malloc(len, file, line);
 
-        strcpy(ret, str);
+        memcpy(ret, str, len);
         return ret;
         }