Commit c5f2b533 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix missing return checks in v3_cpols.c 



Fixed assorted missing return value checks in c3_cpols.c

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 0c7ca403

crypto/x509v3/v3_cpols.c

+12 −4
Original line number Diff line number Diff line
@@ -230,8 +230,12 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx, 
                goto merr;

            if (!sk_POLICYQUALINFO_push(pol->qualifiers, qual))

                goto merr;

            qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);

            qual->d.cpsuri = M_ASN1_IA5STRING_new();

            if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {

                X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);

                goto err;

            }

            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))

                goto merr;

            if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,

                                 strlen(cnf->value)))

                goto merr;
@@ -290,14 +294,18 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx, 
    POLICYQUALINFO *qual;

    if (!(qual = POLICYQUALINFO_new()))

        goto merr;

    qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice);

    if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {

        X509V3err(X509V3_F_NOTICE_SECTION, ERR_R_INTERNAL_ERROR);

        goto err;

    }

    if (!(not = USERNOTICE_new()))

        goto merr;

    qual->d.usernotice = not;

    for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {

        cnf = sk_CONF_VALUE_value(unot, i);

        if (!strcmp(cnf->name, "explicitText")) {

            not->exptext = M_ASN1_VISIBLESTRING_new();

            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))

                goto merr;

            if (!ASN1_STRING_set(not->exptext, cnf->value,

                                 strlen(cnf->value)))

                goto merr;