File pacemaker-pengine-potential-use-of-NULL.patch of Package pacemaker.14737
commit 25d6b6f0112c42e20d59305169b68472870a0b43
Author: Ken Gaillot <kgaillot@redhat.com>
Date: Tue May 9 17:48:51 2017 -0500
Low: pengine,libpengine: avoid potential use-of-NULL
no risk in current code, but handles any future misuse
Index: pacemaker-1.1.16+20170320.77ea74d/lib/pengine/utils.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/lib/pengine/utils.c
+++ pacemaker-1.1.16+20170320.77ea74d/lib/pengine/utils.c
@@ -1697,12 +1697,15 @@ rsc_action_digest_cmp(resource_t * rsc,
const char *restart_list;
const char *op_version;
+ CRM_ASSERT(node != NULL);
+
data = g_hash_table_lookup(node->details->digest_cache, op_id);
if (data) {
return data;
}
data = calloc(1, sizeof(op_digest_cache_t));
+ CRM_ASSERT(data != NULL);
digest_all = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
digest_restart = crm_element_value(xml_op, XML_LRM_ATTR_RESTART_DIGEST);
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/allocate.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/allocate.c
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/allocate.c
@@ -262,7 +262,8 @@ check_action_definition(resource_t * rsc
key = NULL;
}
- crm_trace("Testing %s_%s_%d on %s", rsc->id, task, interval, active_node?active_node->details->uname:"N/A");
+ crm_trace("Testing %s_%s_%d on %s",
+ rsc->id, task, interval, active_node->details->uname);
if (interval == 0 && safe_str_eq(task, RSC_STATUS)) {
/* Reload based on the start action not a probe */
task = RSC_START;