Commit bad6b116 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Raise an error on memory alloc failure. 



Both strdup or malloc failure should raise à err.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1905)
parent 2d13250f

crypto/dh/dh_meth.c

+18 −19
Original line number Diff line number Diff line
@@ -13,19 +13,20 @@ 


DH_METHOD *DH_meth_new(const char *name, int flags)

{

    DH_METHOD *dhm = OPENSSL_zalloc(sizeof(DH_METHOD));

    DH_METHOD *dhm = OPENSSL_zalloc(sizeof(*dhm));



    if (dhm != NULL) {

        dhm->flags = flags;



        dhm->name = OPENSSL_strdup(name);

        if (dhm->name == NULL) {

        if (dhm->name != NULL)

            return dhm;



        OPENSSL_free(dhm);

            DHerr(DH_F_DH_METH_NEW, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

        dhm->flags = flags;

    }



    return dhm;

    DHerr(DH_F_DH_METH_NEW, ERR_R_MALLOC_FAILURE);

    return NULL;

}



void DH_meth_free(DH_METHOD *dhm)
@@ -38,21 +39,20 @@ void DH_meth_free(DH_METHOD *dhm) 


DH_METHOD *DH_meth_dup(const DH_METHOD *dhm)

{

    DH_METHOD *ret;



    ret = OPENSSL_malloc(sizeof(DH_METHOD));

    DH_METHOD *ret = OPENSSL_malloc(sizeof(*ret));



    if (ret != NULL) {

        memcpy(ret, dhm, sizeof(*dhm));



        ret->name = OPENSSL_strdup(dhm->name);

        if (ret->name == NULL) {

        if (ret->name != NULL)

            return ret;



        OPENSSL_free(ret);

            DHerr(DH_F_DH_METH_DUP, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    }



    return ret;

    DHerr(DH_F_DH_METH_DUP, ERR_R_MALLOC_FAILURE);

    return NULL;

}



const char *DH_meth_get0_name(const DH_METHOD *dhm)
@@ -62,9 +62,8 @@ const char *DH_meth_get0_name(const DH_METHOD *dhm) 


int DH_meth_set1_name(DH_METHOD *dhm, const char *name)

{

    char *tmpname;

    char *tmpname = OPENSSL_strdup(name);



    tmpname = OPENSSL_strdup(name);

    if (tmpname == NULL) {

        DHerr(DH_F_DH_METH_SET1_NAME, ERR_R_MALLOC_FAILURE);

        return 0;

crypto/dsa/dsa_meth.c

+18 −19
Original line number Diff line number Diff line
@@ -21,19 +21,20 @@ 


DSA_METHOD *DSA_meth_new(const char *name, int flags)

{

    DSA_METHOD *dsam = OPENSSL_zalloc(sizeof(DSA_METHOD));

    DSA_METHOD *dsam = OPENSSL_zalloc(sizeof(*dsam));



    if (dsam != NULL) {

        dsam->flags = flags;



        dsam->name = OPENSSL_strdup(name);

        if (dsam->name == NULL) {

        if (dsam->name != NULL)

            return dsam;



        OPENSSL_free(dsam);

            DSAerr(DSA_F_DSA_METH_NEW, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

        dsam->flags = flags;

    }



    return dsam;

    DSAerr(DSA_F_DSA_METH_NEW, ERR_R_MALLOC_FAILURE);

    return NULL;

}



void DSA_meth_free(DSA_METHOD *dsam)
@@ -46,21 +47,20 @@ void DSA_meth_free(DSA_METHOD *dsam) 


DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam)

{

    DSA_METHOD *ret;



    ret = OPENSSL_malloc(sizeof(DSA_METHOD));

    DSA_METHOD *ret = OPENSSL_malloc(sizeof(*ret));



    if (ret != NULL) {

        memcpy(ret, dsam, sizeof(*dsam));



        ret->name = OPENSSL_strdup(dsam->name);

        if (ret->name == NULL) {

        if (ret->name != NULL)

            return ret;



        OPENSSL_free(ret);

            DSAerr(DSA_F_DSA_METH_DUP, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    }



    return ret;

    DSAerr(DSA_F_DSA_METH_DUP, ERR_R_MALLOC_FAILURE);

    return NULL;

}



const char *DSA_meth_get0_name(const DSA_METHOD *dsam)
@@ -70,9 +70,8 @@ const char *DSA_meth_get0_name(const DSA_METHOD *dsam) 


int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name)

{

    char *tmpname;

    char *tmpname = OPENSSL_strdup(name);



    tmpname = OPENSSL_strdup(name);

    if (tmpname == NULL) {

        DSAerr(DSA_F_DSA_METH_SET1_NAME, ERR_R_MALLOC_FAILURE);

        return 0;

crypto/rsa/rsa_meth.c

+18 −19
Original line number Diff line number Diff line
@@ -13,19 +13,20 @@ 


RSA_METHOD *RSA_meth_new(const char *name, int flags)

{

    RSA_METHOD *meth = OPENSSL_zalloc(sizeof(RSA_METHOD));

    RSA_METHOD *meth = OPENSSL_zalloc(sizeof(*meth));



    if (meth != NULL) {

        meth->flags = flags;



        meth->name = OPENSSL_strdup(name);

        if (meth->name == NULL) {

        if (meth->name != NULL)

            return meth;



        OPENSSL_free(meth);

            RSAerr(RSA_F_RSA_METH_NEW, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

        meth->flags = flags;

    }



    return meth;

    RSAerr(RSA_F_RSA_METH_NEW, ERR_R_MALLOC_FAILURE);

    return NULL;

}



void RSA_meth_free(RSA_METHOD *meth)
@@ -38,21 +39,20 @@ void RSA_meth_free(RSA_METHOD *meth) 


RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)

{

    RSA_METHOD *ret;



    ret = OPENSSL_malloc(sizeof(RSA_METHOD));

    RSA_METHOD *ret = OPENSSL_malloc(sizeof(*ret));



    if (ret != NULL) {

        memcpy(ret, meth, sizeof(*meth));



        ret->name = OPENSSL_strdup(meth->name);

        if (ret->name == NULL) {

        if (ret->name != NULL)

            return ret;



        OPENSSL_free(ret);

            RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    }



    return ret;

    RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE);

    return NULL;

}



const char *RSA_meth_get0_name(const RSA_METHOD *meth)
@@ -62,9 +62,8 @@ const char *RSA_meth_get0_name(const RSA_METHOD *meth) 


int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)

{

    char *tmpname;

    char *tmpname = OPENSSL_strdup(name);



    tmpname = OPENSSL_strdup(name);

    if (tmpname == NULL) {

        RSAerr(RSA_F_RSA_METH_SET1_NAME, ERR_R_MALLOC_FAILURE);

        return 0;