From 69fb10c74e812b136c6b8284ba02e064101eb977 Mon Sep 17 00:00:00 2001 From: djm <> Date: Mon, 12 Jan 2009 07:57:43 +0000 Subject: convert a strdup (into a purpose-allocated buffer) in libcrypto to a memcpy to avoid linker deprecation warnings; pointed out by dkrause@ --- src/lib/libcrypto/mem_dbg.c | 5 +++-- src/lib/libssl/src/crypto/mem_dbg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c index dfeb084799..c6dee9a92b 100644 --- a/src/lib/libcrypto/mem_dbg.c +++ b/src/lib/libcrypto/mem_dbg.c @@ -810,8 +810,9 @@ void CRYPTO_malloc_debug_init(void) 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; } diff --git a/src/lib/libssl/src/crypto/mem_dbg.c b/src/lib/libssl/src/crypto/mem_dbg.c index dfeb084799..c6dee9a92b 100644 --- a/src/lib/libssl/src/crypto/mem_dbg.c +++ b/src/lib/libssl/src/crypto/mem_dbg.c @@ -810,8 +810,9 @@ void CRYPTO_malloc_debug_init(void) 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; } -- cgit v1.2.3-55-g6feb