2009-09-07 Steve Grubb <sgrubb@redhat.com>

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

diff --git a/ChangeLog b/ChangeLog
index 3cec6d0abe79a6e23da3de749deb4663a05ba9db..1bde071ef396a545b40bdc14cb4dd03cba10bb83 100644 (file)
--- 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 cfd4f17941ccbe1237881c003b507405454e7038..fed03bc6b1fe5c72a23418ad82a0e765908f2a15 100644 (file)
--- 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 9889f65715c703f2f8bc69769cc4430704ec8b1d..a1b3411b78714c24eb9014765cf997bd0e95ebf8 100644 (file)
--- 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 51e17c85715b21d98b7afbf31a1ddc4c72cdf944..a7a8592dd30a631472457f2b1be78bcd8ec2897a 100644 (file)
--- 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 644748db9748c486dbed3e9497d7e4350e87689c..ad3c99318bacdbef305116c564f87305eb963de8 100644 (file)
--- 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;
                }