1 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c
index 1cc62eafd1..24ccf729ca 100644
--- a/src/lib/libcrypto/mem.c
+++ b/src/lib/libcrypto/mem.c
@@ -121,10 +121,10 @@ static void (*set_debug_options_func)(long) = NULL;
 static long (*get_debug_options_func)(void) = NULL;
 #endif
 
+
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
         void (*f)(void *))
         {
-        /* Dummy call just to ensure OPENSSL_init() gets linked in */
         OPENSSL_init();
         if (!allow_customize)
                 return 0;
@@ -326,9 +326,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;
         }