Commit 68efafc5 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Matt Caswell
Browse files

Add checks on sk_TYPE_push() returned value 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent c2d551c0

crypto/asn1/asn_mime.c

+19 −5
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio) 
    char *p, *q, c;

    char *ntmp;

    char linebuf[MAX_SMLEN];

    MIME_HEADER *mhdr = NULL;

    MIME_HEADER *mhdr = NULL, *new_hdr = NULL;

    STACK_OF(MIME_HEADER) *headers;

    int len, state, save_state = 0;
@@ -662,8 +662,13 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio) 
                if (c == ';') {

                    mime_debug("Found End Value\n");

                    *p = 0;

                    mhdr = mime_hdr_new(ntmp, strip_ends(q));

                    sk_MIME_HEADER_push(headers, mhdr);

                    new_hdr = mime_hdr_new(ntmp, strip_ends(q));

                    if (new_hdr == NULL)

                        goto err;

                    if (!sk_MIME_HEADER_push(headers, new_hdr))

                        goto err;

                    mhdr = new_hdr;

                    new_hdr = NULL;

                    ntmp = NULL;

                    q = p + 1;

                    state = MIME_NAME;
@@ -714,8 +719,13 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio) 
        }



        if (state == MIME_TYPE) {

            mhdr = mime_hdr_new(ntmp, strip_ends(q));

            sk_MIME_HEADER_push(headers, mhdr);

            new_hdr = mime_hdr_new(ntmp, strip_ends(q));

            if (new_hdr == NULL)

                goto err;

            if (!sk_MIME_HEADER_push(headers, new_hdr))

                goto err;

            mhdr = new_hdr;

            new_hdr = NULL;

        } else if (state == MIME_VALUE)

            mime_hdr_addparam(mhdr, ntmp, strip_ends(q));

        if (p == linebuf)
@@ -724,6 +734,10 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio) 


    return headers;



err:

    mime_hdr_free(new_hdr);

    sk_MIME_HEADER_pop_free(headers, mime_hdr_free);

    return NULL;

}



static char *strip_ends(char *name)

crypto/ct/ct_log.c

+4 −1
Original line number Diff line number Diff line
@@ -182,7 +182,10 @@ static int ctlog_store_load_log(const char *log_name, int log_name_len, 
        return 1;

    }



    sk_CTLOG_push(load_ctx->log_store->logs, ct_log);

    if (!sk_CTLOG_push(load_ctx->log_store->logs, ct_log)) {

        CTLOG_free(ct_log);

        return -1;

    }

    return 1;

}

crypto/evp/evp_pbe.c

+4 −1
Original line number Diff line number Diff line
@@ -173,7 +173,10 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid, 
    pbe_tmp->md_nid = md_nid;

    pbe_tmp->keygen = keygen;



    sk_EVP_PBE_CTL_push(pbe_algs, pbe_tmp);

    if (!sk_EVP_PBE_CTL_push(pbe_algs, pbe_tmp)) {

        OPENSSL_free(pbe_tmp);

        goto err;

    }

    return 1;



 err:

crypto/objects/o_names.c

+9 −3
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), 
                       int (*cmp_func) (const char *, const char *),

                       void (*free_func) (const char *, int, const char *))

{

    int ret;

    int i;

    int ret, i, push;

    NAME_FUNCS *name_funcs;



    if (name_funcs_stack == NULL) {
@@ -102,8 +101,15 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *), 
        name_funcs->hash_func = OPENSSL_LH_strhash;

        name_funcs->cmp_func = obj_strcmp;

        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);

        sk_NAME_FUNCS_push(name_funcs_stack, name_funcs);



        push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs);

        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);



        if (!push) {

            OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);

            OPENSSL_free(name_funcs);

            return 0;

        }

    }

    name_funcs = sk_NAME_FUNCS_value(name_funcs_stack, ret);

    if (hash_func != NULL)

crypto/ocsp/ocsp_cl.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid) 
    OCSP_ONEREQ *one = NULL;



    if ((one = OCSP_ONEREQ_new()) == NULL)

        goto err;

        return NULL;

    OCSP_CERTID_free(one->reqCert);

    one->reqCert = cid;

    if (req && !sk_OCSP_ONEREQ_push(req->tbsRequest.requestList, one))