From 4a8f751b7c85b80ed3cbb5c1292200ebfaa49747 Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Mon, 19 Nov 2012 14:28:20 -0500 Subject: socket: fix double-free when ssl_setup_connection fails Change-Id: I893b166da28f4c21e582ed477399c4bc0c1d20e1 BUG: 877903 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/4208 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- rpc/rpc-transport/socket/src/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rpc') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index ff6983f8..97612610 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -303,6 +303,7 @@ ssl_error: ssl_dump_error_stack(this->name); free_ssl: SSL_free(priv->ssl_ssl); + priv->ssl_ssl = NULL; done: return ret; } @@ -495,7 +496,7 @@ __socket_disconnect (rpc_transport_t *this) "shutdown() returned %d. %s", ret, strerror (errno)); } - if (priv->use_ssl) { + if (priv->ssl_ssl) { SSL_shutdown(priv->ssl_ssl); SSL_clear(priv->ssl_ssl); SSL_free(priv->ssl_ssl); -- cgit