Commit 5e04cfde authored by Dmitry-Me's avatar Dmitry-Me Committed by Rich Salz
Browse files

GH769: Reuse strndup() 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Signed-off-by: default avatarRich Salz <rsalz@akamai.com>
parent aacfb134

crypto/x509v3/v3_alt.c

+1 −3
Original line number Diff line number Diff line
@@ -577,11 +577,9 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx) 
    if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL)

        return 0;

    objlen = p - value;

    objtmp = OPENSSL_malloc(objlen + 1);

    objtmp = OPENSSL_strndup(value, objlen);

    if (objtmp == NULL)

        return 0;

    strncpy(objtmp, value, objlen);

    objtmp[objlen] = 0;

    gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);

    OPENSSL_free(objtmp);

    if (!gen->d.otherName->type_id)

crypto/x509v3/v3_info.c

+1 −3
Original line number Diff line number Diff line
@@ -177,13 +177,11 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD 
        ctmp.value = cnf->value;

        if (!v2i_GENERAL_NAME_ex(acc->location, method, ctx, &ctmp, 0))

            goto err;

        if ((objtmp = OPENSSL_malloc(objlen + 1)) == NULL) {

        if ((objtmp = OPENSSL_strndup(cnf->name, objlen)) == NULL) {

            X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,

                      ERR_R_MALLOC_FAILURE);

            goto err;

        }

        strncpy(objtmp, cnf->name, objlen);

        objtmp[objlen] = 0;

        acc->method = OBJ_txt2obj(objtmp, 0);

        if (!acc->method) {

            X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,