From 462ae9d7a53181f564fb3f92debd74105bc6a5bb Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Tue, 25 Jan 2011 00:39:07 +0100
Subject: [PATCH] Fix memory leak of operator certfp fields.

---
 src/newconf.c   | 6 +++++-
 src/s_newconf.c | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/newconf.c b/src/newconf.c
index ee9c946c..8b1dfa6a 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -597,7 +597,7 @@ conf_end_oper(struct TopConf *tc)
 		}
 
 		if(!EmptyString(yy_oper->certfp))
-			yy_tmpoper->certfp = yy_oper->certfp;
+			yy_tmpoper->certfp = rb_strdup(yy_oper->certfp);
 #endif
 
 		/* all is ok, put it on oper_conf_list */
@@ -621,6 +621,8 @@ conf_set_oper_flags(void *data)
 static void
 conf_set_oper_fingerprint(void *data)
 {
+	if (yy_oper->certfp)
+		rb_free(yy_oper->certfp);
 	yy_oper->certfp = rb_strdup((char *) data);
 }
 
@@ -1322,6 +1324,8 @@ conf_set_connect_accept_password(void *data)
 static void
 conf_set_connect_fingerprint(void *data)
 {
+	if (yy_server->certfp)
+		rb_free(yy_server->certfp);
 	yy_server->certfp = rb_strdup((char *) data);
 
 	/* force SSL to be enabled if fingerprint is enabled. */
diff --git a/src/s_newconf.c b/src/s_newconf.c
index 36e94a59..f7590b21 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -262,6 +262,7 @@ free_oper_conf(struct oper_conf *oper_p)
 	rb_free(oper_p->username);
 	rb_free(oper_p->host);
 	rb_free(oper_p->name);
+	rb_free(oper_p->certfp);
 
 	if(oper_p->passwd)
 	{