diff options
| author | Pauli <paul.dale@oracle.com> | 2019-11-21 06:55:50 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-11-22 08:18:42 +1000 |
| commit | bd65afdb21942676e7e4ce77adaaec697624b65f (patch) | |
| tree | 35d477d9b69f68c4890912644224a153fa79f053 /crypto/core_namemap.c | |
| parent | e44192d14b0557538611de4018170d702c9709d7 (diff) | |
Core: allow NULL argument to stored_namemap_free().
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10488)
Diffstat (limited to 'crypto/core_namemap.c')
| -rw-r--r-- | crypto/core_namemap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index e5a17272d8..9b19d60db3 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -72,9 +72,11 @@ static void stored_namemap_free(void *vnamemap) { OSSL_NAMEMAP *namemap = vnamemap; - /* Pretend it isn't stored, or ossl_namemap_free() will do nothing */ - namemap->stored = 0; - ossl_namemap_free(namemap); + if (namemap != NULL) { + /* Pretend it isn't stored, or ossl_namemap_free() will do nothing */ + namemap->stored = 0; + ossl_namemap_free(namemap); + } } static const OPENSSL_CTX_METHOD stored_namemap_method = { |