Commit cc99bfa7 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Fix a few missed "if (!ptr)" cleanups 



And a scalar !x --> x==0 test
Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent e44380a9

crypto/bio/bio_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ BIO *BIO_find_type(BIO *bio, int type) 
{

    int mt, mask;



    if (!bio)

    if (bio == NULL)

        return NULL;

    mask = type & 0xff;

    do {
@@ -491,7 +491,7 @@ BIO *BIO_find_type(BIO *bio, int type) 


BIO *BIO_next(BIO *b)

{

    if (!b)

    if (b == NULL)

        return NULL;

    return b->next_bio;

}

crypto/x509/x_x509.c

+2 −3
Original line number Diff line number Diff line
@@ -175,12 +175,11 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) 
    /* Save start position */

    q = *pp;



    if (!a || *a == NULL) {

    if (a == NULL || *a == NULL)

        freeret = 1;

    }

    ret = d2i_X509(a, &q, length);

    /* If certificate unreadable then forget it */

    if (!ret)

    if (ret == NULL)

        return NULL;

    /* update length */

    length -= q - *pp;

ssl/ssl_sess.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ int ssl_get_new_session(SSL *s, int session) 
         * Don't allow the callback to set the session length to zero. nor

         * set it higher than it was.

         */

        if (!tmp || (tmp > ss->session_id_length)) {

        if (tmp == 0 || tmp > ss->session_id_length) {

            /* The callback set an illegal length */

            SSLerr(SSL_F_SSL_GET_NEW_SESSION,

                   SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH);