cluster: STABLE32 - rgmanager: Revert patch that caused a regression when operating on resources

Ryan McCabe rmccabe at fedoraproject.org
Tue May 29 14:31:39 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c0afc6f3180dd61c9b212e2eb61cdc8d9c56af9f
Commit:        c0afc6f3180dd61c9b212e2eb61cdc8d9c56af9f
Parent:        8f73b914907ad17d41be3b849cd936f77e8a6248
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Tue May 29 10:30:11 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue May 29 10:30:11 2012 -0400

rgmanager: Revert patch that caused a regression when operating on resources

Revert "resrules: fix free while passing the pointer to caller"

This reverts commit 215dd94070707fdb421197bfe625fb9d531ecbec.
---
 rgmanager/src/daemons/resrules.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/resrules.c b/rgmanager/src/daemons/resrules.c
index 557ef9c..104eb28 100644
--- a/rgmanager/src/daemons/resrules.c
+++ b/rgmanager/src/daemons/resrules.c
@@ -205,8 +205,11 @@ _get_version(xmlDocPtr doc, xmlXPathContextPtr ctx, char *base,
 
 	snprintf(xpath, sizeof(xpath), "%s/@version", base);
 	ret = xpath_get_one(doc, ctx, xpath);
-	/* NULL or actual result of the query */
-	rr->rr_version = ret;
+	if (ret) {
+		rr->rr_version = ret;
+		free(ret);
+	}
+	rr->rr_version = NULL;
 }
 
 


More information about the cluster-commits mailing list