[Pkg-shadow-commits] r3060 - in upstream/trunk: . lib libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-09-07 18:53:47 +0000 (Mon, 07 Sep 2009)
New Revision: 3060

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/groupmem.c
   upstream/trunk/lib/pwmem.c
   upstream/trunk/lib/shadowmem.c
   upstream/trunk/libmisc/copydir.c
Log:
2009-09-07  Steve Grubb  <sgrubb at redhat.com>

	* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c:
	Fix some memory leaks.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-09-05 22:31:29 UTC (rev 3059)
+++ upstream/trunk/ChangeLog	2009-09-07 18:53:47 UTC (rev 3060)
@@ -1,3 +1,8 @@
+2009-09-07  Steve Grubb  <sgrubb at 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 at centraliens.net>
 
 	* src/userdel.c, src/lastlog.c, src/gpasswd.c, src/newusers.c,

Modified: upstream/trunk/lib/groupmem.c
===================================================================
--- upstream/trunk/lib/groupmem.c	2009-09-05 22:31:29 UTC (rev 3059)
+++ upstream/trunk/lib/groupmem.c	2009-09-07 18:53:47 UTC (rev 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;
 		}
 	}

Modified: upstream/trunk/lib/pwmem.c
===================================================================
--- upstream/trunk/lib/pwmem.c	2009-09-05 22:31:29 UTC (rev 3059)
+++ upstream/trunk/lib/pwmem.c	2009-09-07 18:53:47 UTC (rev 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;
 	}
 

Modified: upstream/trunk/lib/shadowmem.c
===================================================================
--- upstream/trunk/lib/shadowmem.c	2009-09-05 22:31:29 UTC (rev 3059)
+++ upstream/trunk/lib/shadowmem.c	2009-09-07 18:53:47 UTC (rev 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;
 	}
 

Modified: upstream/trunk/libmisc/copydir.c
===================================================================
--- upstream/trunk/libmisc/copydir.c	2009-09-05 22:31:29 UTC (rev 3059)
+++ upstream/trunk/libmisc/copydir.c	2009-09-07 18:53:47 UTC (rev 3060)
@@ -443,6 +443,7 @@
 		nchars = readlink (filename, buffer, size);
 
 		if (nchars < 0) {
+			free(buffer);
 			return NULL;
 		}