Commit 4cacc9d5 authored by Pauli's avatar Pauli
Browse files

Revert "GH614: Use memcpy()/strdup() when possible" 



This reverts commit a89c9a0d.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4357)
parent eff1752b

crypto/dso/dso_dl.c

+4 −2
Original line number Diff line number Diff line
@@ -156,21 +156,23 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2) 
     * if the second file specification is missing.

     */

    if (!filespec2 || filespec1[0] == '/') {

        merged = OPENSSL_strdup(filespec1);

        merged = OPENSSL_malloc(strlen(filespec1) + 1);

        if (merged == NULL) {

            DSOerr(DSO_F_DL_MERGER, ERR_R_MALLOC_FAILURE);

            return (NULL);

        }

        strcpy(merged, filespec1);

    }

    /*

     * If the first file specification is missing, the second one rules.

     */

    else if (!filespec1) {

        merged = OPENSSL_strdup(filespec2);

        merged = OPENSSL_malloc(strlen(filespec2) + 1);

        if (merged == NULL) {

            DSOerr(DSO_F_DL_MERGER, ERR_R_MALLOC_FAILURE);

            return (NULL);

        }

        strcpy(merged, filespec2);

    } else

        /*

         * This part isn't as trivial as it looks.  It assumes that the

crypto/dso/dso_dlfcn.c

+4 −2
Original line number Diff line number Diff line
@@ -196,21 +196,23 @@ static char *dlfcn_merger(DSO *dso, const char *filespec1, 
     * if the second file specification is missing.

     */

    if (!filespec2 || (filespec1 != NULL && filespec1[0] == '/')) {

        merged = OPENSSL_strdup(filespec1);

        merged = OPENSSL_malloc(strlen(filespec1) + 1);

        if (merged == NULL) {

            DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE);

            return (NULL);

        }

        strcpy(merged, filespec1);

    }

    /*

     * If the first file specification is missing, the second one rules.

     */

    else if (!filespec1) {

        merged = OPENSSL_strdup(filespec2);

        merged = OPENSSL_malloc(strlen(filespec2) + 1);

        if (merged == NULL) {

            DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE);

            return (NULL);

        }

        strcpy(merged, filespec2);

    } else {

        /*

         * This part isn't as trivial as it looks.  It assumes that the

crypto/o_str.c

+2 −4
Original line number Diff line number Diff line
@@ -27,14 +27,12 @@ int OPENSSL_memcmp(const void *v1, const void *v2, size_t n) 
char *CRYPTO_strdup(const char *str, const char* file, int line)

{

    char *ret;

    size_t size;



    if (str == NULL)

        return NULL;

    size = strlen(str) + 1;

    ret = CRYPTO_malloc(size, file, line);

    ret = CRYPTO_malloc(strlen(str) + 1, file, line);

    if (ret != NULL)

        memcpy(ret, str, size);

        strcpy(ret, str);

    return ret;

}

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2471,7 +2471,7 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len) 
            *p = '\0';

            return buf;

        }

        memcpy(p, c->name, n + 1);

        strcpy(p, c->name);

        p += n;

        *(p++) = ':';

        len -= n + 1;