1 files changed, 116 insertions, 0 deletions
diff --git a/source/a/shadow/patches/r3060.diff b/source/a/shadow/patches/r3060.diff
new file mode 100644
index 00000000..8ece6430
--- /dev/null
+++ b/source/a/shadow/patches/r3060.diff
@@ -0,0 +1,116 @@
+* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c:
+Fix some memory leaks.
+
+Index: libmisc/copydir.c
+===================================================================
+--- libmisc/copydir.c	(revision 3059)
++++ libmisc/copydir.c	(revision 3060)
+@@ -443,6 +443,7 @@
+ 		nchars = readlink (filename, buffer, size);
+ 
+ 		if (nchars < 0) {
++			free(buffer);
+ 			return NULL;
+ 		}
+ 
+
+Index: lib/shadowmem.c
+===================================================================
+--- lib/shadowmem.c	(revision 3059)
++++ lib/shadowmem.c	(revision 3060)
+@@ -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;
+ 	}
+ 
+Index: lib/groupmem.c
+===================================================================
+--- lib/groupmem.c	(revision 3059)
++++ lib/groupmem.c	(revision 3060)
+@@ -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;
+ 		}
+ 	}
+Index: lib/pwmem.c
+===================================================================
+--- lib/pwmem.c	(revision 3059)
++++ lib/pwmem.c	(revision 3060)
+@@ -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;
+ 	}
+