From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9662 invoked by alias); 6 Mar 2009 19:26:05 -0000 Received: (qmail 9643 invoked by alias); 6 Mar 2009 19:26:05 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_56,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_56,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: master - notifyd: fix memory leak in environment generation To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d261c93b272d0512775055cb9040fbf191844abd X-Git-Newrev: b458559bae9cf9bc8451baf21cd5dfffb7e1b7ba From: "Fabio M. Di Nitto" Message-Id: <20090306192540.7DDEB1201C1@lists.fedorahosted.org> Date: Fri, 06 Mar 2009 19:26: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/msg00719.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b458559bae9cf9bc8451baf21cd5dfffb7e1b7ba Commit: b458559bae9cf9bc8451baf21cd5dfffb7e1b7ba Parent: d261c93b272d0512775055cb9040fbf191844abd Author: Fabio M. Di Nitto AuthorDate: Fri Mar 6 20:19:45 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 6 20:25:31 2009 +0100 notifyd: fix memory leak in environment generation spotted by valgrind. Signed-off-by: Fabio M. Di Nitto --- cman/notifyd/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index 7722032..e864690 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -226,11 +226,11 @@ static void dispatch_notification(char *str, int *quorum) if (debug) envp[envptr++] = strdup("CMAN_NOTIFICATION_DEBUG=1"); - envp[envptr++] = NULL; + envp[envptr--] = NULL; argv[argvptr++] = "cman_notify"; - argv[argvptr++] = NULL; + argv[argvptr--] = NULL; switch ( (notify_pid = fork()) ) { @@ -250,6 +250,12 @@ static void dispatch_notification(char *str, int *quorum) break; } + while(envptr >= 0) { + if (envp[envptr]) + free(envp[envptr]); + + envptr--; + } } static void cman_callback(cman_handle_t ch, void *private, int reason, int arg)