|
 |
26ad17 |
From 47c3e06b098c7e148c54675588d03b4d2bea40b5 Mon Sep 17 00:00:00 2001
|
|
|
26ad17 |
From: Chris Lumens <clumens@redhat.com>
|
|
|
26ad17 |
Date: Mon, 22 Jun 2020 16:20:01 -0400
|
|
|
26ad17 |
Subject: [PATCH] Fix: libpacemaker: Don't allow a potential NULL in a format
|
|
|
26ad17 |
string.
|
|
|
26ad17 |
|
|
|
26ad17 |
This is only tripping up F32 s390x builds, but I don't suppose there's
|
|
|
26ad17 |
any reason it couldn't come up elsewhere later.
|
|
|
26ad17 |
---
|
|
|
26ad17 |
lib/pacemaker/pcmk_sched_constraints.c | 4 ++--
|
|
|
26ad17 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
26ad17 |
|
|
|
26ad17 |
diff --git a/lib/pacemaker/pcmk_sched_constraints.c b/lib/pacemaker/pcmk_sched_constraints.c
|
|
|
26ad17 |
index 9c3a88d..d8c3e69 100644
|
|
|
26ad17 |
--- a/lib/pacemaker/pcmk_sched_constraints.c
|
|
|
26ad17 |
+++ b/lib/pacemaker/pcmk_sched_constraints.c
|
|
|
26ad17 |
@@ -1595,8 +1595,8 @@ custom_action_order(pe_resource_t * lh_rsc, char *lh_action_task, pe_action_t *
|
|
|
26ad17 |
order = calloc(1, sizeof(pe__ordering_t));
|
|
|
26ad17 |
|
|
|
26ad17 |
crm_trace("Creating[%d] %s %s %s - %s %s %s", data_set->order_id,
|
|
|
26ad17 |
- lh_rsc?lh_rsc->id:"NA", lh_action_task, lh_action?lh_action->uuid:"NA",
|
|
|
26ad17 |
- rh_rsc?rh_rsc->id:"NA", rh_action_task, rh_action?rh_action->uuid:"NA");
|
|
|
26ad17 |
+ lh_rsc?lh_rsc->id:"NA", lh_action_task?lh_action_task:"NA", lh_action?lh_action->uuid:"NA",
|
|
|
26ad17 |
+ rh_rsc?rh_rsc->id:"NA", rh_action_task?rh_action_task:"NA", rh_action?rh_action->uuid:"NA");
|
|
|
26ad17 |
|
|
|
26ad17 |
/* CRM_ASSERT(data_set->order_id != 291); */
|
|
|
26ad17 |
|
|
|
26ad17 |
--
|
|
|
26ad17 |
1.8.3.1
|
|
|
26ad17 |
|