|
 |
139d2d |
From 12a6af187dec7b0c229673958dd0916e2479584e Mon Sep 17 00:00:00 2001
|
|
|
139d2d |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
139d2d |
Date: Mon, 26 Jun 2017 18:39:30 -0500
|
|
|
139d2d |
Subject: [PATCH 1/2] Low: pengine: avoid use of NULL
|
|
|
139d2d |
|
|
|
139d2d |
---
|
|
|
139d2d |
pengine/clone.c | 2 +-
|
|
|
139d2d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
139d2d |
|
|
|
139d2d |
diff --git a/pengine/clone.c b/pengine/clone.c
|
|
|
139d2d |
index 28f368e..1722166 100644
|
|
|
139d2d |
--- a/pengine/clone.c
|
|
|
139d2d |
+++ b/pengine/clone.c
|
|
|
139d2d |
@@ -868,7 +868,7 @@ clone_create_pseudo_actions(
|
|
|
139d2d |
if (stop_notify != NULL && *stop_notify == NULL) {
|
|
|
139d2d |
*stop_notify = create_notification_boundaries(rsc, RSC_STOP, stop, stopped, data_set);
|
|
|
139d2d |
|
|
|
139d2d |
- if (*stop_notify && *start_notify) {
|
|
|
139d2d |
+ if (start_notify && *start_notify && *stop_notify) {
|
|
|
139d2d |
order_actions((*stop_notify)->post_done, (*start_notify)->pre, pe_order_optional);
|
|
|
139d2d |
}
|
|
|
139d2d |
}
|
|
|
139d2d |
--
|
|
|
139d2d |
1.8.3.1
|
|
|
139d2d |
|
|
|
139d2d |
|
|
|
139d2d |
From 4882ac112253f1f3afece01eb2e32a87b6d3689e Mon Sep 17 00:00:00 2001
|
|
|
139d2d |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
139d2d |
Date: Tue, 27 Jun 2017 11:11:45 -0500
|
|
|
139d2d |
Subject: [PATCH 2/2] Low: libpe_status: avoid use-after-free
|
|
|
139d2d |
|
|
|
139d2d |
---
|
|
|
139d2d |
lib/pengine/container.c | 4 ++--
|
|
|
139d2d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
139d2d |
|
|
|
139d2d |
diff --git a/lib/pengine/container.c b/lib/pengine/container.c
|
|
|
139d2d |
index 5d4e697..a21f0a4 100644
|
|
|
139d2d |
--- a/lib/pengine/container.c
|
|
|
139d2d |
+++ b/lib/pengine/container.c
|
|
|
139d2d |
@@ -1035,9 +1035,9 @@ tuple_free(container_grouping_t *tuple)
|
|
|
139d2d |
}
|
|
|
139d2d |
|
|
|
139d2d |
if(tuple->ip) {
|
|
|
139d2d |
- tuple->ip->fns->free(tuple->ip);
|
|
|
139d2d |
- tuple->ip->xml = NULL;
|
|
|
139d2d |
free_xml(tuple->ip->xml);
|
|
|
139d2d |
+ tuple->ip->xml = NULL;
|
|
|
139d2d |
+ tuple->ip->fns->free(tuple->ip);
|
|
|
139d2d |
tuple->ip = NULL;
|
|
|
139d2d |
}
|
|
|
139d2d |
if(tuple->docker) {
|
|
|
139d2d |
--
|
|
|
139d2d |
1.8.3.1
|
|
|
139d2d |
|