File pacemaker-pengine-use-of-NULL-unpacking-tickets... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-pengine-use-of-NULL-unpacking-tickets.patch of Package pacemaker

commit 937f2950b0588195004695cabf8c06f38fac845e
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Mon Oct 2 16:17:04 2017 -0500

Low: pengine: avoid use-of-NULL when unpacking tickets
    
    not possible with current code, but cleaner
    
    also improve related log messages

Index: pacemaker-1.1.16+20170320.77ea74d/pengine/constraints.c
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/constraints.c
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/constraints.c
@@ -2643,23 +2643,19 @@ unpack_rsc_ticket_set(xmlNode * set, tic
 {
     xmlNode *xml_rsc = NULL;
     resource_t *resource = NULL;
-    const char *set_id = ID(set);
-    const char *role = crm_element_value(set, "role");
+    const char *set_id = NULL;
+    const char *role = NULL;
 
-    if (set == NULL) {
-        crm_config_err("No resource_set object to process.");
-        return FALSE;
-    }
+    CRM_CHECK(set != NULL, return FALSE);
+    CRM_CHECK(ticket != NULL, return FALSE);
 
+    set_id = ID(set);
     if (set_id == NULL) {
         crm_config_err("resource_set must have an id");
         return FALSE;
     }
 
-    if (ticket == NULL) {
-        crm_config_err("No dependented ticket specified for '%s'", set_id);
-        return FALSE;
-    }
+    role = crm_element_value(set, "role");
 
     for (xml_rsc = __xml_first_child(set); xml_rsc != NULL; xml_rsc = __xml_next_element(xml_rsc)) {
         if (crm_str_eq((const char *)xml_rsc->name, XML_TAG_RESOURCE_REF, TRUE)) {

Places

File pacemaker-pengine-use-of-NULL-unpacking-tickets.patch of Package pacemaker

Places