Blame SOURCES/103-use-of-null.patch
|
 |
26ee02 |
From a7a671ed9848bed9469b3166ac769183f1b791d4 Mon Sep 17 00:00:00 2001
|
|
|
26ee02 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
26ee02 |
Date: Fri, 3 Nov 2017 16:40:20 -0500
|
|
|
26ee02 |
Subject: [PATCH] Low: pengine: avoid not-really-possible use-of-NULL
|
|
|
26ee02 |
|
|
|
26ee02 |
makes static analysis happy
|
|
|
26ee02 |
---
|
|
|
26ee02 |
pengine/container.c | 5 ++++-
|
|
|
26ee02 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
26ee02 |
|
|
|
26ee02 |
diff --git a/pengine/container.c b/pengine/container.c
|
|
|
26ee02 |
index 9d49b7c..f5d916c 100644
|
|
|
26ee02 |
--- a/pengine/container.c
|
|
|
26ee02 |
+++ b/pengine/container.c
|
|
|
26ee02 |
@@ -906,7 +906,10 @@ container_create_probe(resource_t * rsc, node_t * node, action_t * complete,
|
|
|
26ee02 |
}
|
|
|
26ee02 |
}
|
|
|
26ee02 |
}
|
|
|
26ee02 |
- if(tuple->remote && tuple->remote->cmds->create_probe(tuple->remote, node, complete, force, data_set)) {
|
|
|
26ee02 |
+ if (tuple->docker && tuple->remote
|
|
|
26ee02 |
+ && tuple->remote->cmds->create_probe(tuple->remote, node, complete,
|
|
|
26ee02 |
+ force, data_set)) {
|
|
|
26ee02 |
+
|
|
|
26ee02 |
/* Do not probe the remote resource until we know where docker is running
|
|
|
26ee02 |
* Required for REMOTE_CONTAINER_HACK to correctly probe remote resources
|
|
|
26ee02 |
*/
|
|
|
26ee02 |
--
|
|
|
26ee02 |
1.8.3.1
|
|
|
26ee02 |
|