From 3dac141f4c5593c162589ae4043e02f35b345c3f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 19 Sep 2016 18:17:24 -0600
Subject: [PATCH] Fix memory corruption issue

---
 src/slurmctld/fed_mgr.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/slurmctld/fed_mgr.c b/src/slurmctld/fed_mgr.c
index f242229d893..662e83e3df1 100644
--- a/src/slurmctld/fed_mgr.c
+++ b/src/slurmctld/fed_mgr.c
@@ -926,8 +926,14 @@ extern int fed_mgr_add_sibling_conn(slurm_persist_conn_t *persist_conn,
 	cluster->control_port = persist_conn->rem_port;
 	xfree(cluster->control_host);
 	cluster->control_host = xstrdup(persist_conn->rem_host);
-	slurm_persist_conn_destroy(cluster->fed.recv);
+
+	/* If this pointer exists it will be handled by the persist_conn code,
+	 * don't free
+	 */
+	//slurm_persist_conn_destroy(cluster->fed.recv);
+
 	cluster->fed.recv = persist_conn;
+
 	slurm_mutex_unlock(&cluster->lock);
 
 	unlock_slurmctld(fed_read_lock);
-- 
GitLab