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

Standardise our style for checking malloc failures 



if we have a malloc |x = OPENSSL_malloc(...)| sometimes we check |x|
for NULL and sometimes we treat it as a boolean |if(!x) ...|. Standardise
the approach in libssl.

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 3457e7a0

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int dtls1_new(SSL *s) 
    d1->link_mtu = 0;

    d1->mtu = 0;



    if (!d1->buffered_messages || !d1->sent_messages) {

    if (d1->buffered_messages == NULL || d1->sent_messages == NULL) {

        pqueue_free(d1->buffered_messages);

        pqueue_free(d1->sent_messages);

        OPENSSL_free(d1);

ssl/record/rec_layer_d1.c

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl) 
    d->processed_rcds.q = pqueue_new();

    d->buffered_app_data.q = pqueue_new();



    if (!d->unprocessed_rcds.q || !d->processed_rcds.q

        || !d->buffered_app_data.q) {

    if (d->unprocessed_rcds.q == NULL || d->processed_rcds.q == NULL

        || d->buffered_app_data.q == NULL) {

        pqueue_free(d->unprocessed_rcds.q);

        pqueue_free(d->processed_rcds.q);

        pqueue_free(d->buffered_app_data.q);

ssl/record/rec_layer_s3.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) 
                packlen *= 4;



            wb->buf = OPENSSL_malloc(packlen);

            if (!wb->buf) {

            if (wb->buf == NULL) {

                SSLerr(SSL_F_SSL3_WRITE_BYTES, ERR_R_MALLOC_FAILURE);

                return -1;

            }

ssl/s3_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -4311,7 +4311,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 
                return 0;

#endif

            ptmp = EVP_PKEY_new();

            if (!ptmp)

            if (ptmp == NULL)

                return 0;

#ifndef OPENSSL_NO_RSA

            else if (s->s3->peer_rsa_tmp)
@@ -4999,7 +4999,7 @@ static int ssl3_set_req_cert_type(CERT *c, const unsigned char *p, size_t len) 
    if (len > 0xff)

        return 0;

    c->ctypes = OPENSSL_malloc(len);

    if (!c->ctypes)

    if (c->ctypes == NULL)

        return 0;

    memcpy(c->ctypes, p, len);

    c->ctype_num = len;

ssl/ssl_cert.c

+4 −4
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ CERT *ssl_cert_dup(CERT *cert) 
    /* Configured sigalgs copied across */

    if (cert->conf_sigalgs) {

        ret->conf_sigalgs = OPENSSL_malloc(cert->conf_sigalgslen);

        if (!ret->conf_sigalgs)

        if (ret->conf_sigalgs == NULL)

            goto err;

        memcpy(ret->conf_sigalgs, cert->conf_sigalgs, cert->conf_sigalgslen);

        ret->conf_sigalgslen = cert->conf_sigalgslen;
@@ -291,7 +291,7 @@ CERT *ssl_cert_dup(CERT *cert) 


    if (cert->client_sigalgs) {

        ret->client_sigalgs = OPENSSL_malloc(cert->client_sigalgslen);

        if (!ret->client_sigalgs)

        if (ret->client_sigalgs == NULL)

            goto err;

        memcpy(ret->client_sigalgs, cert->client_sigalgs,

               cert->client_sigalgslen);
@@ -303,7 +303,7 @@ CERT *ssl_cert_dup(CERT *cert) 
    /* Copy any custom client certificate types */

    if (cert->ctypes) {

        ret->ctypes = OPENSSL_malloc(cert->ctype_num);

        if (!ret->ctypes)

        if (ret->ctypes == NULL)

            goto err;

        memcpy(ret->ctypes, cert->ctypes, cert->ctype_num);

        ret->ctype_num = cert->ctype_num;
@@ -968,7 +968,7 @@ int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags) 
    /* Rearranging and check the chain: add everything to a store */

    if (flags & SSL_BUILD_CHAIN_FLAG_CHECK) {

        chain_store = X509_STORE_new();

        if (!chain_store)

        if (chain_store == NULL)

            goto err;

        for (i = 0; i < sk_X509_num(cpk->chain); i++) {

            x = sk_X509_value(cpk->chain, i);