This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: master - notifyd: don't leak memory if we fail to forkcman_notify
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 6 Mar 2009 19:51:56 +0000 (UTC)
- Subject: cluster: master - notifyd: don't leak memory if we fail to forkcman_notify
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a924b0972ff281c8a22a1f7d01755c01ea750e4a
Commit: a924b0972ff281c8a22a1f7d01755c01ea750e4a
Parent: b458559bae9cf9bc8451baf21cd5dfffb7e1b7ba
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Fri Mar 6 20:48:11 2009 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 6 20:51:48 2009 +0100
notifyd: don't leak memory if we fail to fork cman_notify
on error path we were not freeing envp strings.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
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 e864690..bcacefa 100644
--- a/cman/notifyd/main.c
+++ b/cman/notifyd/main.c
@@ -210,6 +210,7 @@ static void dispatch_notification(char *str, int *quorum)
char scratch[PATH_MAX];
pid_t notify_pid;
int pidstatus;
+ int err = 0;
if (!str)
return;
@@ -236,13 +237,15 @@ static void dispatch_notification(char *str, int *quorum)
{
case -1:
/* unable to fork */
- exit(EXIT_FAILURE);
+ err = 1;
+ goto out;
break;
case 0: /* child */
execve(SBINDIR "/cman_notify", argv, envp);
/* unable to execute cman_notify */
- exit(EXIT_FAILURE);
+ err = 1;
+ goto out;
break;
default: /* parent */
@@ -250,12 +253,15 @@ static void dispatch_notification(char *str, int *quorum)
break;
}
+out:
while(envptr >= 0) {
if (envp[envptr])
free(envp[envptr]);
envptr--;
}
+ if (err)
+ exit(EXIT_FAILURE);
}
static void cman_callback(cman_handle_t ch, void *private, int reason, int arg)