summaryrefslogtreecommitdiffstats
path: root/crypto/dso/dso_win32.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-09-14 16:13:53 -0400
committerRich Salz <rsalz@openssl.org>2017-09-14 16:13:53 -0400
commit297002a332302a102a9fd802012f12ba2ad056c1 (patch)
tree31b7fe39f049247b811335555672a078661218e5 /crypto/dso/dso_win32.c
parent6807b84eacc89aee6eed2730e7dd3ce7171cc834 (diff)
Replace malloc+strcpy with strdup
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4371)
Diffstat (limited to 'crypto/dso/dso_win32.c')
-rw-r--r--crypto/dso/dso_win32.c6
1 files changed, 2 insertions, 4 deletions
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) {