Fix memory leak with SSL connections due to missing X509_free() calls.

tglsfdc · tglsfdc · commit e0cd17521299 · 2003-12-18T22:49:26.000Z
Per Neil Conway.
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.44 2003/11/29 19:51:49 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.45 2003/12/18 22:49:26 tgl Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -714,6 +714,9 @@ destroy_SSL(void)
 static int
 open_server_SSL(Port *port)
 {
+	Assert(!port->ssl);
+	Assert(!port->peer);
+
 	if (!(port->ssl = SSL_new(SSL_context)) ||
 		!SSL_set_fd(port->ssl, port->sock) ||
 		SSL_accept(port->ssl) <= 0)
@@ -764,6 +767,12 @@ close_SSL(Port *port)
 		SSL_free(port->ssl);
 		port->ssl = NULL;
 	}
+
+	if (port->peer)
+	{
+		X509_free(port->peer);
+		port->peer = NULL;
+	}
 }
 
 /*
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.33 2003/11/29 19:52:12 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.34 2003/12/18 22:49:26 tgl Exp $
  *
  * NOTES
  *	  The client *requires* a valid server certificate.  Since
@@ -1004,6 +1004,12 @@ close_SSL(PGconn *conn)
 		SSL_free(conn->ssl);
 		conn->ssl = NULL;
 	}
+
+	if (conn->peer)
+	{
+		X509_free(conn->peer);
+		conn->peer = NULL;
+	}
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.44 2003/11/29 19:51:49 pgsql Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.45 2003/12/18 22:49:26 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -714,6 +714,9 @@ destroy_SSL(void)`
`714`	`714`	`static int`
`715`	`715`	`open_server_SSL(Port *port)`
`716`	`716`	`{`
	`717`	`+ Assert(!port->ssl);`
	`718`	`+ Assert(!port->peer);`
	`719`	`+`
`717`	`720`	`if (!(port->ssl = SSL_new(SSL_context)) \|\|`
`718`	`721`	`!SSL_set_fd(port->ssl, port->sock) \|\|`
`719`	`722`	`SSL_accept(port->ssl) <= 0)`
`@@ -764,6 +767,12 @@ close_SSL(Port *port)`
`764`	`767`	`SSL_free(port->ssl);`
`765`	`768`	`port->ssl = NULL;`
`766`	`769`	`}`
	`770`	`+`
	`771`	`+ if (port->peer)`
	`772`	`+ {`
	`773`	`+ X509_free(port->peer);`
	`774`	`+ port->peer = NULL;`
	`775`	`+ }`
`767`	`776`	`}`
`768`	`777`
`769`	`778`	`/*`