Blame SOURCES/112-use-of-null.patch
|
 |
399718 |
From 88bd30b1e750138551a7b45786eaf6c28985f91d Mon Sep 17 00:00:00 2001
|
|
|
399718 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
399718 |
Date: Thu, 2 Nov 2017 18:08:56 -0500
|
|
|
399718 |
Subject: [PATCH] Low: pengine: avoid use-of-NULL
|
|
|
399718 |
|
|
|
399718 |
---
|
|
|
399718 |
pengine/native.c | 3 ++-
|
|
|
399718 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
399718 |
|
|
|
399718 |
diff --git a/pengine/native.c b/pengine/native.c
|
|
|
399718 |
index d0cdcc4..5dc0420 100644
|
|
|
399718 |
--- a/pengine/native.c
|
|
|
399718 |
+++ b/pengine/native.c
|
|
|
399718 |
@@ -2407,7 +2407,8 @@ LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal)
|
|
|
399718 |
next->details->uname);
|
|
|
399718 |
|
|
|
399718 |
} else if (start && is_set(start->flags, pe_action_runnable) == FALSE) {
|
|
|
399718 |
- LogAction("Stop", rsc, current, NULL, stop, stop->reason?stop:start, terminal);
|
|
|
399718 |
+ LogAction("Stop", rsc, current, NULL, stop,
|
|
|
399718 |
+ (stop && stop->reason)? stop : start, terminal);
|
|
|
399718 |
STOP_SANITY_ASSERT(__LINE__);
|
|
|
399718 |
|
|
|
399718 |
} else if (moving && current) {
|
|
|
399718 |
--
|
|
|
399718 |
1.8.3.1
|
|
|
399718 |
|