Commit 690d040b authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Add NULL checks from master 



The big "don't check for NULL" cleanup requires backporting some
of the lowest-level functions to actually do nothing if NULL is
given.  This will make it easier to backport fixes to release
branches, where master assumes those lower-level functions are "safe"

This commit addresses those tickets: 3798 3799 3801.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit f34b095f)
parent 6c638671

crypto/x509/x509_lu.c

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ X509_STORE *X509_STORE_new(void) 


static void cleanup(X509_OBJECT *a)

{

    if (!a)

        return;

    if (a->type == X509_LU_X509) {

        X509_free(a->data.x509);

    } else if (a->type == X509_LU_CRL) {

crypto/x509/x509_vfy.c

+2 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,8 @@ X509_STORE_CTX *X509_STORE_CTX_new(void) 


void X509_STORE_CTX_free(X509_STORE_CTX *ctx)

{

    if (!ctx)

        return;

    X509_STORE_CTX_cleanup(ctx);

    OPENSSL_free(ctx);

}