From: Dmitry-Me <wipedout@yandex.ru>
Date: Mon, 29 Feb 2016 08:55:13 +0000 (+0300)
Subject: GH762: Reuse strdup()
X-Git-Tag: OpenSSL_1_1_0-pre4~434
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=edae9834b6eeeb7af8839187a6de82131991ec4b;p=oweals%2Fopenssl.git

GH762: Reuse strdup()

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 0921fb2409..c410eac9ee 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -341,12 +341,11 @@ int DSO_set_filename(DSO *dso, const char *filename)
         return (0);
     }
     /* We'll duplicate filename */
-    copied = OPENSSL_malloc(strlen(filename) + 1);
+    copied = OPENSSL_strdup(filename);
     if (copied == NULL) {
         DSOerr(DSO_F_DSO_SET_FILENAME, ERR_R_MALLOC_FAILURE);
         return (0);
     }
-    OPENSSL_strlcpy(copied, filename, strlen(filename) + 1);
     OPENSSL_free(dso->filename);
     dso->filename = copied;
     return (1);
@@ -390,12 +389,11 @@ char *DSO_convert_filename(DSO *dso, const char *filename)
             result = dso->meth->dso_name_converter(dso, filename);
     }
     if (result == NULL) {
-        result = OPENSSL_malloc(strlen(filename) + 1);
+        result = OPENSSL_strdup(filename);
         if (result == NULL) {
             DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_MALLOC_FAILURE);
             return (NULL);
         }
-        OPENSSL_strlcpy(result, filename, strlen(filename) + 1);
     }
     return (result);
 }