Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.6:Update
pacemaker.29834
bsc#1211678-0007-Low-tools-avoid-insignificant-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bsc#1211678-0007-Low-tools-avoid-insignificant-memory-leaks.patch of Package pacemaker.29834
From bee54eba4d9c28d3a7907a3e13a5deeee6bc0916 Mon Sep 17 00:00:00 2001 From: Ken Gaillot <kgaillot@redhat.com> Date: Tue, 27 Jul 2021 11:01:04 -0500 Subject: [PATCH 7/8] Low: tools: avoid (insignificant) memory leaks detected by valgrind --- tools/crmadmin.c | 2 ++ tools/crm_diff.c | 2 +- tools/crm_resource.c | 33 +++++++++++++++++----------- tools/crm_resource_ban.c | 2 +- 4 files changed, 24 insertions(+), 15 deletions(-) Index: pacemaker-2.0.1+20190417.13d370ca9/tools/crmadmin.c =================================================================== --- pacemaker-2.0.1+20190417.13d370ca9.orig/tools/crmadmin.c +++ pacemaker-2.0.1+20190417.13d370ca9/tools/crmadmin.c @@ -252,6 +252,7 @@ do_work(void) int rc = the_cib->cmds->signon(the_cib, crm_system_name, cib_command); if (rc != pcmk_ok) { + cib_delete(the_cib); return -1; } @@ -262,6 +263,7 @@ do_work(void) free_xml(output); } the_cib->cmds->signoff(the_cib); + cib_delete(the_cib); crm_exit(crm_errno2exit(rc)); } else if (DO_RESET) { Index: pacemaker-2.0.1+20190417.13d370ca9/tools/crm_diff.c =================================================================== --- pacemaker-2.0.1+20190417.13d370ca9.orig/tools/crm_diff.c +++ pacemaker-2.0.1+20190417.13d370ca9/tools/crm_diff.c @@ -357,5 +357,5 @@ main(int argc, char **argv) free_xml(object_1); free_xml(object_2); - return crm_errno2exit(rc); + crm_exit(crm_errno2exit(rc)); } Index: pacemaker-2.0.1+20190417.13d370ca9/tools/crm_resource.c =================================================================== --- pacemaker-2.0.1+20190417.13d370ca9.orig/tools/crm_resource.c +++ pacemaker-2.0.1+20190417.13d370ca9/tools/crm_resource.c @@ -961,25 +961,29 @@ main(int argc, char **argv) if (require_dataset) { if (xml_file != NULL) { cib_xml_copy = filename2xml(xml_file); + if (cib_xml_copy == NULL) { + rc = -pcmk_err_cib_corrupt; + } } else { rc = cib_conn->cmds->query(cib_conn, NULL, &cib_xml_copy, cib_scope_local | cib_sync_call); } - if(rc != pcmk_ok) { - goto bail; + if (rc == pcmk_ok) { + data_set = pe_new_working_set(); + if (data_set == NULL) { + rc = -ENOMEM; + } else { + rc = update_working_set_xml(data_set, &cib_xml_copy); + } } - /* Populate the working set instance */ - data_set = pe_new_working_set(); - if (data_set == NULL) { - rc = -ENOMEM; - goto bail; - } - rc = update_working_set_xml(data_set, &cib_xml_copy); if (rc != pcmk_ok) { + free_xml(cib_xml_copy); + cib_xml_copy = NULL; goto bail; } + cluster_status(data_set); } @@ -1162,6 +1166,8 @@ main(int argc, char **argv) if (rc != pcmk_ok) { CMD_ERR("Could not get modified CIB: %s\n", pcmk_strerror(rc)); g_list_free(before); + free_xml(cib_xml_copy); + cib_xml_copy = NULL; goto bail; } Index: pacemaker-2.0.1+20190417.13d370ca9/tools/crm_resource_ban.c =================================================================== --- pacemaker-2.0.1+20190417.13d370ca9.orig/tools/crm_resource_ban.c +++ pacemaker-2.0.1+20190417.13d370ca9/tools/crm_resource_ban.c @@ -256,7 +256,7 @@ resource_clear_node_in_location(const ch rc = pcmk_ok; } - free(fragment); + free_xml(fragment); return rc; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor