From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30183 invoked by alias); 31 Mar 2009 16:08:36 -0000 Received: (qmail 29447 invoked by alias); 31 Mar 2009 16:08:34 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE2 - fenced: fix premature free of victim name To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 05985c63592e45d3df24186e59768a5eccf485d6 X-Git-Newrev: aee97b180e80c9f8b90b8fca63004afe3b289962 From: David Teigland Message-Id: <20090331160806.DDCE5120197@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 16:08:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg01003.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=aee97b180e80c9f8b90b8fca63004afe3b289962 Commit: aee97b180e80c9f8b90b8fca63004afe3b289962 Parent: 05985c63592e45d3df24186e59768a5eccf485d6 Author: David Teigland AuthorDate: Tue Mar 31 11:02:03 2009 -0500 Committer: David Teigland CommitterDate: Tue Mar 31 11:02:03 2009 -0500 fenced: fix premature free of victim name also fixes fencing for multiple methods (from STABLE3) Signed-off-by: David Teigland --- fence/fenced/agent.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c index a41dd03..dd3ef2b 100644 --- a/fence/fenced/agent.c +++ b/fence/fenced/agent.c @@ -354,8 +354,6 @@ int dispatch_fence_agent(char *victim, int force) if (device) free(device); - if (victim_nodename) - free(victim_nodename); free(method); if (!error) { @@ -364,6 +362,9 @@ int dispatch_fence_agent(char *victim, int force) } } + if (victim_nodename) + free(victim_nodename); + ccs_disconnect(cd); return error;