The branch master has been updated
via 3457e7a087a643cb65d67d9d72ec5983a02f5dfe (commit)
from 6703c4ea87b30554283deaa5df1f8d68725d3ee4 (commit)
- Log -----------------------------------------------------------------
commit 3457e7a087a643cb65d67d9d72ec5983a02f5dfe
Author: Matt Caswell <[email protected]>
Date: Mon Nov 9 15:31:27 2015 +0000
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ssl/ssl_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
