From 6e9864fe0de08f6297b1b89fd143605e6ff99ec2 Mon Sep 17 00:00:00 2001
From: artix <artix2@gmail.com>
Date: Wed, 9 Jan 2019 18:49:38 +0100
Subject: [PATCH] Cluster Manager: fix bus error in clusterManagerGetLinkStatus

---
 src/redis-cli.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/redis-cli.c b/src/redis-cli.c
index 71c8c6b3..b17bd9ea 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -1994,6 +1994,15 @@ static dictType clusterManagerDictType = {
     dictSdsDestructor          /* val destructor */
 };
 
+static dictType clusterManagerLinkDictType = {
+    dictSdsHash,               /* hash function */
+    NULL,                      /* key dup */
+    NULL,                      /* val dup */
+    dictSdsKeyCompare,         /* key compare */
+    dictSdsDestructor,         /* key destructor */
+    dictListDestructor         /* val destructor */
+};
+
 typedef int clusterManagerCommandProc(int argc, char **argv);
 typedef int (*clusterManagerOnReplyError)(redisReply *reply,
     clusterManagerNode *n, int bulk_idx);
@@ -3889,7 +3898,7 @@ static list *clusterManagerGetDisconnectedLinks(clusterManagerNode *node) {
                             (strstr(link_status, "disconnected")));
         int handshaking = (strstr(flags, "handshake") != NULL);
         if (disconnected || handshaking) {
-            clusterManagerLink *link = zmalloc(sizeof(*link)); 
+            clusterManagerLink *link = zmalloc(sizeof(*link));
             link->node_name = sdsnew(nodename);
             link->node_addr = sdsnew(addr);
             link->connected = 0;
@@ -3902,15 +3911,12 @@ cleanup:
     return links;
 }
 
-/* Check for disconnected cluster links. It returns a dict whose keys 
- * are the unreachable node addresses and the values are lists of 
+/* Check for disconnected cluster links. It returns a dict whose keys
+ * are the unreachable node addresses and the values are lists of
  * node addresses that cannot reach the unreachable node. */
 static dict *clusterManagerGetLinkStatus(void) {
     if (cluster_manager.nodes == NULL) return NULL;
-    dictType dtype = clusterManagerDictType;
-    dtype.keyDestructor = dictSdsDestructor;
-    dtype.valDestructor = dictListDestructor;
-    dict *status = dictCreate(&dtype, NULL);
+    dict *status = dictCreate(&clusterManagerLinkDictType, NULL);
     listIter li;
     listNode *ln;
     listRewind(cluster_manager.nodes, &li);