diff options
| author | Matt Caswell <matt@openssl.org> | 2015-11-09 15:31:27 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 15:36:19 +0000 |
| commit | 3457e7a087a643cb65d67d9d72ec5983a02f5dfe (patch) | |
| tree | 8f0b1a89d91fcf19aea4f1d7f6cb47c9c4498cd0 | |
| parent | 6703c4ea87b30554283deaa5df1f8d68725d3ee4 (diff) | |
| download | openssl-3457e7a087a643cb65d67d9d72ec5983a02f5dfe.zip openssl-3457e7a087a643cb65d67d9d72ec5983a02f5dfe.tar.gz openssl-3457e7a087a643cb65d67d9d72ec5983a02f5dfe.tar.bz2 | |
Remove redundant check from SSL_shutdown
The SSL object was being deref'd and then there was a later redundant check
to see if it is NULL. We assume all SSL_foo functions pass a non NULL SSL
object and do not check it.
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 0674cb4..ec85256 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -990,7 +990,7 @@ int SSL_shutdown(SSL *s) return -1; } - if ((s != NULL) && !SSL_in_init(s)) + if (!SSL_in_init(s)) return (s->method->ssl_shutdown(s)); else return (1); |