malloc() sets errno to ENOMEM already.

Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>

diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index 759e6e8925121bfc9bd86028c485f015b097d192..66767201f6939f8913cc2be4c4eb96defe792ae0 100644 (file)
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -505,17 +505,13 @@ gr_add(struct group *gr, char *newmember)
        }
        /* Allocate enough for current pointers + 1 more and NULL marker */
        mlen = (num_mem + 2) * sizeof(*gr->gr_mem);
        }
        /* Allocate enough for current pointers + 1 more and NULL marker */
        mlen = (num_mem + 2) * sizeof(*gr->gr_mem);

-       if ((members = malloc(mlen)) == NULL) {
+       if ((members = malloc(mlen)) == NULL)

                errno = ENOMEM;
                errno = ENOMEM;

-               return (NULL);
-       }

        memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
        members[num_mem++] = newmember;
        members[num_mem] = NULL;
        gr->gr_mem = members;
        newgr = gr_dup(gr);
        memcpy(members, gr->gr_mem, num_mem * sizeof(*gr->gr_mem));
        members[num_mem++] = newmember;
        members[num_mem] = NULL;
        gr->gr_mem = members;
        newgr = gr_dup(gr);

-       if (newgr == NULL)
-               errno = ENOMEM;

        free(members);
        return (newgr);
 }
        free(members);
        return (newgr);
 }