From 442699c9edec2f3e4243b322f4adc81ece6c4c83 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 20 Jun 2019 13:55:01 +0000 Subject: Holy memory leaks, Batman --- src/libnsss/nsss_all_getgrent_r.c | 2 ++ src/libnsss/nsss_all_getgrgid_r.c | 2 ++ src/libnsss/nsss_all_getgrnam_r.c | 2 ++ src/libnsss/nsss_switch_getgrent_r.c | 2 ++ src/libnsss/nsss_switch_getgrgid_r.c | 2 ++ src/libnsss/nsss_switch_getgrnam_r.c | 2 ++ src/libnsss/nsss_unix_getgrent_r.c | 2 ++ src/libnsss/nsss_unix_getgrgid_r.c | 2 ++ src/libnsss/nsss_unix_getgrnam_r.c | 2 ++ 9 files changed, 18 insertions(+) diff --git a/src/libnsss/nsss_all_getgrent_r.c b/src/libnsss/nsss_all_getgrent_r.c index 8cdcad6..3e0557d 100644 --- a/src/libnsss/nsss_all_getgrent_r.c +++ b/src/libnsss/nsss_all_getgrent_r.c @@ -28,10 +28,12 @@ int nsss_all_getgrent_r (struct group *gr, char *buf, size_t buflen, struct grou } if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_all_getgrgid_r.c b/src/libnsss/nsss_all_getgrgid_r.c index bd48322..3b01543 100644 --- a/src/libnsss/nsss_all_getgrgid_r.c +++ b/src/libnsss/nsss_all_getgrgid_r.c @@ -27,10 +27,12 @@ int nsss_all_getgrgid_r (gid_t gid, struct group *gr, char *buf, size_t buflen, nsss_switch_end(&a, NSSS_SWITCH_GRP) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_all_getgrnam_r.c b/src/libnsss/nsss_all_getgrnam_r.c index d129d3c..7d78110 100644 --- a/src/libnsss/nsss_all_getgrnam_r.c +++ b/src/libnsss/nsss_all_getgrnam_r.c @@ -27,10 +27,12 @@ int nsss_all_getgrnam_r (char const *name, struct group *gr, char *buf, size_t b nsss_switch_end(&a, NSSS_SWITCH_GRP) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_switch_getgrent_r.c b/src/libnsss/nsss_switch_getgrent_r.c index 97a7bbd..92a4264 100644 --- a/src/libnsss/nsss_switch_getgrent_r.c +++ b/src/libnsss/nsss_switch_getgrent_r.c @@ -26,10 +26,12 @@ int nsss_switch_getgrent_r (struct group *gr, char *buf, size_t buflen, struct g } if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_switch_getgrgid_r.c b/src/libnsss/nsss_switch_getgrgid_r.c index c87b57d..2eb4855 100644 --- a/src/libnsss/nsss_switch_getgrgid_r.c +++ b/src/libnsss/nsss_switch_getgrgid_r.c @@ -26,10 +26,12 @@ int nsss_switch_getgrgid_r (gid_t gid, struct group *gr, char *buf, size_t bufle nsss_switch_end(&a, NSSS_SWITCH_GRP) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_switch_getgrnam_r.c b/src/libnsss/nsss_switch_getgrnam_r.c index e6d00ec..c35b8ef 100644 --- a/src/libnsss/nsss_switch_getgrnam_r.c +++ b/src/libnsss/nsss_switch_getgrnam_r.c @@ -26,10 +26,12 @@ int nsss_switch_getgrnam_r (char const *name, struct group *gr, char *buf, size_ nsss_switch_end(&a, NSSS_SWITCH_GRP) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_unix_getgrent_r.c b/src/libnsss/nsss_unix_getgrent_r.c index 5ddc526..cec4d20 100644 --- a/src/libnsss/nsss_unix_getgrent_r.c +++ b/src/libnsss/nsss_unix_getgrent_r.c @@ -25,10 +25,12 @@ int nsss_unix_getgrent_r (struct group *gr, char *buf, size_t buflen, struct gro } if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_unix_getgrgid_r.c b/src/libnsss/nsss_unix_getgrgid_r.c index 5d3dbe5..d41cee3 100644 --- a/src/libnsss/nsss_unix_getgrgid_r.c +++ b/src/libnsss/nsss_unix_getgrgid_r.c @@ -25,10 +25,12 @@ int nsss_unix_getgrgid_r (gid_t gid, struct group *gr, char *buf, size_t buflen, nsss_unix_grp_end(&a) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; diff --git a/src/libnsss/nsss_unix_getgrnam_r.c b/src/libnsss/nsss_unix_getgrnam_r.c index bc63d78..05970d0 100644 --- a/src/libnsss/nsss_unix_getgrnam_r.c +++ b/src/libnsss/nsss_unix_getgrnam_r.c @@ -25,10 +25,12 @@ int nsss_unix_getgrnam_r (char const *name, struct group *gr, char *buf, size_t nsss_unix_grp_end(&a) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = 0 ; return errno ; } + genalloc_free(char *, &ga) ; stralloc_free(&sa) ; *grp = gr ; return (errno = e, 0) ; -- cgit v1.2.3