From 1e6b107d9910c43f62185e6c6966c316501aef64 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 7 Sep 2009 18:53:47 +0000
Subject: [PATCH] 2009-09-07  Steve Grubb  <sgrubb@redhat.com>

	* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c:
	Fix some memory leaks.
---
 ChangeLog         |  5 +++++
 lib/groupmem.c    | 13 +++++++++++++
 lib/pwmem.c       | 15 +++++++++++++++
 lib/shadowmem.c   |  3 +++
 libmisc/copydir.c |  1 +
 5 files changed, 37 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3cec6d0a..1bde071e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-07  Steve Grubb  <sgrubb@redhat.com>
+
+	* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c:
+	Fix some memory leaks.
+
 2009-09-06  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/userdel.c, src/lastlog.c, src/gpasswd.c, src/newusers.c,
diff --git a/lib/groupmem.c b/lib/groupmem.c
index cfd4f179..fed03bc6 100644
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -51,10 +51,13 @@
 	*gr = *grent;
 	gr->gr_name = strdup (grent->gr_name);
 	if (NULL == gr->gr_name) {
+		free(gr);
 		return NULL;
 	}
 	gr->gr_passwd = strdup (grent->gr_passwd);
 	if (NULL == gr->gr_passwd) {
+		free(gr->gr_name);
+		free(gr);
 		return NULL;
 	}
 
@@ -62,11 +65,21 @@
 
 	gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *));
 	if (NULL == gr->gr_mem) {
+		free(gr->gr_passwd);
+		free(gr->gr_name);
+		free(gr);
 		return NULL;
 	}
 	for (i = 0; grent->gr_mem[i]; i++) {
 		gr->gr_mem[i] = strdup (grent->gr_mem[i]);
 		if (NULL == gr->gr_mem[i]) {
+			int j;
+			for (j=0; j<i; j++)
+				free(gr->gr_mem[j]);
+			free(gr->gr_mem);
+			free(gr->gr_passwd);
+			free(gr->gr_name);
+			free(gr);
 			return NULL;
 		}
 	}
diff --git a/lib/pwmem.c b/lib/pwmem.c
index 9889f657..a1b3411b 100644
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -51,22 +51,37 @@
 	*pw = *pwent;
 	pw->pw_name = strdup (pwent->pw_name);
 	if (NULL == pw->pw_name) {
+		free(pw);
 		return NULL;
 	}
 	pw->pw_passwd = strdup (pwent->pw_passwd);
 	if (NULL == pw->pw_passwd) {
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_gecos = strdup (pwent->pw_gecos);
 	if (NULL == pw->pw_gecos) {
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_dir = strdup (pwent->pw_dir);
 	if (NULL == pw->pw_dir) {
+		free(pw->pw_gecos);
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 	pw->pw_shell = strdup (pwent->pw_shell);
 	if (NULL == pw->pw_shell) {
+		free(pw->pw_dir);
+		free(pw->pw_gecos);
+		free(pw->pw_passwd);
+		free(pw->pw_name);
+		free(pw);
 		return NULL;
 	}
 
diff --git a/lib/shadowmem.c b/lib/shadowmem.c
index 51e17c85..a7a8592d 100644
--- a/lib/shadowmem.c
+++ b/lib/shadowmem.c
@@ -52,10 +52,13 @@
 	*sp = *spent;
 	sp->sp_namp = strdup (spent->sp_namp);
 	if (NULL == sp->sp_namp) {
+		free(sp);
 		return NULL;
 	}
 	sp->sp_pwdp = strdup (spent->sp_pwdp);
 	if (NULL == sp->sp_pwdp) {
+		free(sp->sp_namp);
+		free(sp);
 		return NULL;
 	}
 
diff --git a/libmisc/copydir.c b/libmisc/copydir.c
index 644748db..ad3c9931 100644
--- a/libmisc/copydir.c
+++ b/libmisc/copydir.c
@@ -443,6 +443,7 @@ static char *readlink_malloc (const char *filename)
 		nchars = readlink (filename, buffer, size);
 
 		if (nchars < 0) {
+			free(buffer);
 			return NULL;
 		}