diff options
| author | Rich Salz <rsalz@openssl.org> | 2018-03-27 16:25:08 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-03-27 16:25:08 -0400 |
| commit | e6e9170d6e28038768895e1af18e3aad8093bf4b (patch) | |
| tree | 62f594f0968ff8d6c27795377a102e4aab373b00 /ssl/s3_lib.c | |
| parent | 98c03302fb7b855647aa14022f61f5fb272e514a (diff) | |
Allow NULL for some _free routines.
Based on the description in https://github.com/openssl/openssl/pull/5757,
this re-implements the "allow NULL to be passed" behavior of a number of
xxx_free routines. I also fixed up some egregious formatting errors
that were nearby.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5761)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 78a5a3a2e2..619326949c 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3312,7 +3312,7 @@ int ssl3_new(SSL *s) void ssl3_free(SSL *s) { - if (s->s3 == NULL) + if (s == NULL || s->s3 == NULL) return; ssl3_cleanup_key_block(s); |