Medium: Fix uninitialized data for --with-heartbeat.

beekhof · Oct 16, 2012 · 7282066 · 7282066
1 parent ae383c5
commit 7282066
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/fencing/main.c b/fencing/main.c
@@ -1005,6 +1005,7 @@ main(int argc, char ** argv)
 
     if(stand_alone == FALSE) {
 #if SUPPORT_HEARTBEAT
+        cluster.hb_conn = NULL;
         cluster.hb_dispatch = stonith_peer_hb_callback;
         cluster.destroy = stonith_peer_hb_destroy;
 #endif

diff --git a/lib/cluster/cluster.c b/lib/cluster/cluster.c
@@ -314,7 +314,7 @@ send_cluster_message(crm_node_t *node, enum crm_ais_msg_types service, xmlNode *
 #endif
 #if SUPPORT_HEARTBEAT
     if (is_heartbeat_cluster()) {
-        return send_ha_message(heartbeat_cluster, data, node->uname, ordered);
+        return send_ha_message(heartbeat_cluster, data, node ? node->uname : NULL, ordered);
     }
 #endif
     return FALSE;

diff --git a/tools/attrd.c b/tools/attrd.c
@@ -575,6 +575,7 @@ main(int argc, char **argv)
 
 #if SUPPORT_HEARTBEAT
         if (is_heartbeat_cluster()) {
+            cluster.hb_conn = NULL;
             cluster.hb_dispatch = attrd_ha_callback;
             cluster.destroy = attrd_ha_connection_destroy;
         }