diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-12 11:49:32 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-13 12:55:23 -0400 |
| commit | 76b49a8ad7759c2b702376d1ebc90008bdc26373 (patch) | |
| tree | cdb6ab9e9eed8927a78a1b0a1cdc79ce3e990df8 | |
| parent | 5e0ec9012bae4cc261ec300a0bf1432fbb13ee2a (diff) | |
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: Matt Caswell <matt@openssl.org>
(cherry picked from commit f34b095fab1569d093b639bfcc9a77d6020148ff)
| -rw-r--r-- | crypto/cmac/cmac.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_lu.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c index c5597a3f73..774e6dc919 100644 --- a/crypto/cmac/cmac.c +++ b/crypto/cmac/cmac.c @@ -126,6 +126,8 @@ EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx) void CMAC_CTX_free(CMAC_CTX *ctx) { + if (!ctx) + return; CMAC_CTX_cleanup(ctx); OPENSSL_free(ctx); } diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index a910636f82..8415d1d8b3 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -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) { diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 136bfbda61..559b5cdeb5 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -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); } |