From 297002a332302a102a9fd802012f12ba2ad056c1 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 14 Sep 2017 16:13:53 -0400 Subject: Replace malloc+strcpy with strdup Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/4371) --- crypto/dso/dso_win32.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crypto/dso/dso_win32.c') diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 635974be70..5f50774bb8 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -398,19 +398,17 @@ static char *win32_merger(DSO *dso, const char *filespec1, return (NULL); } if (!filespec2) { - merged = OPENSSL_malloc(strlen(filespec1) + 1); + merged = OPENSSL_strdup(filespec1); if (merged == NULL) { DSOerr(DSO_F_WIN32_MERGER, ERR_R_MALLOC_FAILURE); return (NULL); } - strcpy(merged, filespec1); } else if (!filespec1) { - merged = OPENSSL_malloc(strlen(filespec2) + 1); + merged = OPENSSL_strdup(filespec2); if (merged == NULL) { DSOerr(DSO_F_WIN32_MERGER, ERR_R_MALLOC_FAILURE); return (NULL); } - strcpy(merged, filespec2); } else { filespec1_split = win32_splitter(dso, filespec1, 0); if (!filespec1_split) { -- cgit v1.2.3