File pacemaker#3394-0002-Low-libpacemaker-Correctly-... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker#3394-0002-Low-libpacemaker-Correctly-free-graphs-and-synapses.patch of Package pacemaker

From e725721056920d2480bc488688af51768969ba22 Mon Sep 17 00:00:00 2001
From: Reid Wahl <nrwahl@protonmail.com>
Date: Wed, 20 Mar 2024 17:40:18 -0700
Subject: [PATCH 2/2] Low: libpacemaker: Correctly free graphs and synapses

Memory leak found by Cppcheck.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
---
 lib/pacemaker/pcmk_graph_consumer.c | 136 ++++++++++++++--------------
 1 file changed, 68 insertions(+), 68 deletions(-)

Index: pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_graph_consumer.c
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/lib/pacemaker/pcmk_graph_consumer.c
+++ pacemaker-2.1.7+20231219.0f7f88312/lib/pacemaker/pcmk_graph_consumer.c
@@ -21,6 +21,67 @@
 
 
 /*
+ * Functions for freeing transition graph objects
+ */
+
+/*!
+ * \internal
+ * \brief Free a transition graph action object
+ *
+ * \param[in,out] user_data  Action to free
+ */
+static void
+free_graph_action(gpointer user_data)
+{
+    pcmk__graph_action_t *action = user_data;
+
+    if (action->timer != 0) {
+        crm_warn("Cancelling timer for graph action %d", action->id);
+        g_source_remove(action->timer);
+    }
+    if (action->params != NULL) {
+        g_hash_table_destroy(action->params);
+    }
+    free_xml(action->xml);
+    free(action);
+}
+
+/*!
+ * \internal
+ * \brief Free a transition graph synapse object
+ *
+ * \param[in,out] user_data  Synapse to free
+ */
+static void
+free_graph_synapse(gpointer user_data)
+{
+    pcmk__graph_synapse_t *synapse = user_data;
+
+    g_list_free_full(synapse->actions, free_graph_action);
+    g_list_free_full(synapse->inputs, free_graph_action);
+    free(synapse);
+}
+
+/*!
+ * \internal
+ * \brief Free a transition graph object
+ *
+ * \param[in,out] graph  Transition graph to free
+ */
+void
+pcmk__free_graph(pcmk__graph_t *graph)
+{
+    if (graph != NULL) {
+        g_list_free_full(graph->synapses, free_graph_synapse);
+        free(graph->source);
+        free(graph->failed_stop_offset);
+        free(graph->failed_start_offset);
+        free(graph);
+    }
+}
+
+
+/*
  * Functions for updating graph
  */
 
@@ -589,8 +650,8 @@ unpack_synapse(pcmk__graph_t *new_graph,
     value = crm_element_value(xml_synapse, XML_CIB_ATTR_PRIORITY);
     pcmk__scan_min_int(value, &(new_synapse->priority), 0);
 
-    CRM_CHECK(new_synapse->id >= 0, free(new_synapse);
-                                    return NULL);
+    CRM_CHECK(new_synapse->id >= 0,
+              free_graph_synapse((gpointer) new_synapse); return NULL);
 
     new_graph->num_synapses++;
 
@@ -685,7 +746,7 @@ pcmk__unpack_graph(const xmlNode *xml_gr
 
     new_graph->source = strdup((reference == NULL)? "unknown" : reference);
     if (new_graph->source == NULL) {
-        free(new_graph);
+        pcmk__free_graph(new_graph);
         return NULL;
     }
 
@@ -699,13 +760,13 @@ pcmk__unpack_graph(const xmlNode *xml_gr
     if (xml_graph != NULL) {
         const char *buf = crm_element_value(xml_graph, "transition_id");
 
-        CRM_CHECK(buf != NULL, free(new_graph);
-                               return NULL);
+        CRM_CHECK(buf != NULL,
+                  pcmk__free_graph(new_graph); return NULL);
         pcmk__scan_min_int(buf, &(new_graph->id), -1);
 
         buf = crm_element_value(xml_graph, "cluster-delay");
-        CRM_CHECK(buf != NULL, free(new_graph);
-                               return NULL);
+        CRM_CHECK(buf != NULL,
+                  pcmk__free_graph(new_graph); return NULL);
         new_graph->network_delay = crm_parse_interval_spec(buf);
 
         buf = crm_element_value(xml_graph, "stonith-timeout");
@@ -758,67 +819,6 @@ pcmk__unpack_graph(const xmlNode *xml_gr
 }
 
 
-/*
- * Functions for freeing transition graph objects
- */
-
-/*!
- * \internal
- * \brief Free a transition graph action object
- *
- * \param[in,out] user_data  Action to free
- */
-static void
-free_graph_action(gpointer user_data)
-{
-    pcmk__graph_action_t *action = user_data;
-
-    if (action->timer != 0) {
-        crm_warn("Cancelling timer for graph action %d", action->id);
-        g_source_remove(action->timer);
-    }
-    if (action->params != NULL) {
-        g_hash_table_destroy(action->params);
-    }
-    free_xml(action->xml);
-    free(action);
-}
-
-/*!
- * \internal
- * \brief Free a transition graph synapse object
- *
- * \param[in,out] user_data  Synapse to free
- */
-static void
-free_graph_synapse(gpointer user_data)
-{
-    pcmk__graph_synapse_t *synapse = user_data;
-
-    g_list_free_full(synapse->actions, free_graph_action);
-    g_list_free_full(synapse->inputs, free_graph_action);
-    free(synapse);
-}
-
-/*!
- * \internal
- * \brief Free a transition graph object
- *
- * \param[in,out] graph  Transition graph to free
- */
-void
-pcmk__free_graph(pcmk__graph_t *graph)
-{
-    if (graph != NULL) {
-        g_list_free_full(graph->synapses, free_graph_synapse);
-        free(graph->source);
-        free(graph->failed_stop_offset);
-        free(graph->failed_start_offset);
-        free(graph);
-    }
-}
-
-
 /*
  * Other transition graph utilities
  */

Places

File pacemaker#3394-0002-Low-libpacemaker-Correctly-free-graphs-and-synapses.patch of Package pacemaker

Places