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:03 -0400 |
| commit | f34b095fab1569d093b639bfcc9a77d6020148ff (patch) | |
| tree | 1dca25c54033b282c04a080f3f84f29b8bdca130 /crypto/cmac | |
| parent | d3bb25e30ac1e07ce3b163655d8d33bc9f1186e3 (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>
Diffstat (limited to 'crypto/cmac')
| -rw-r--r-- | crypto/cmac/cmac.c | 2 |
1 files changed, 2 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); } |