Commite0cd175

committed

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

Per Neil Conway.

1 parent54840ec commite0cd175Copy full SHA for e0cd175

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 10 additions & 1 deletion

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`	`staticint`
`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`	`/*`

Lines changed: 7 additions & 1 deletion

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/interfaces/libpq/fe-secure.c,v 1.33 2003/11/29 19:52:12 pgsql Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.34 2003/12/18 22:49:26 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* The client requires a valid server certificate. Since`
`@@ -1004,6 +1004,12 @@ close_SSL(PGconn *conn)`
`1004`	`1004`	`SSL_free(conn->ssl);`
`1005`	`1005`	`conn->ssl=NULL;`
`1006`	`1006`	`}`
	`1007`	`+`
	`1008`	`+if (conn->peer)`
	`1009`	`+{`
	`1010`	`+X509_free(conn->peer);`
	`1011`	`+conn->peer=NULL;`
	`1012`	`+}`
`1007`	`1013`	`}`
`1008`	`1014`
`1009`	`1015`	`/*`

Comments

(0)