File jsc#ECO-1611-0016-Fix-controller-avoid-possible-use-of-NULL-on-logging-1.1.patch of Package pacemaker.22685

From b06cc02c56b6ab91a9eb92689b98069bd36f55f9 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Tue, 28 Apr 2020 21:01:48 +0200
Subject: [PATCH 16/17] Fix: controller: avoid possible use-of-NULL on logging
 fencing message

---
 crmd/te_actions.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crmd/te_actions.c b/crmd/te_actions.c
index 45bbf31b9..35f565060 100644
--- a/crmd/te_actions.c
+++ b/crmd/te_actions.c
@@ -186,8 +186,10 @@ te_fence_node(crm_graph_t * graph, crm_action_t * action)
     priority_delay = crm_meta_value(action->params, XML_CONFIG_ATTR_PRIORITY_FENCING_DELAY);
 
     crm_notice("Requesting fencing (%s) of node %s "
-               CRM_XS " action=%s timeout=%u priority_delay=%s",
-               type, target, id, transition_graph->stonith_timeout, priority_delay);
+               CRM_XS " action=%s timeout=%u%s%s",
+               type, target, id, transition_graph->stonith_timeout,
+               priority_delay ? " priority_delay=" : "",
+               priority_delay ? priority_delay : "");
 
     /* Passing NULL means block until we can connect... */
     te_connect_stonith(NULL);
-- 
2.26.1

openSUSE Build Service is sponsored by