summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2015-02-20 01:02:32 +0000
committerpfg <pfg@FreeBSD.org>2015-02-20 01:02:32 +0000
commitaef2a8879198b292401276632f93402f2c715a14 (patch)
tree771c676c1543bc516befceacf3abc7ab60fb0b4d /lib/libc
parentc0ae6c2127580cca43ae3425615b6e3dd2459984 (diff)
downloadFreeBSD-src-aef2a8879198b292401276632f93402f2c715a14.zip
FreeBSD-src-aef2a8879198b292401276632f93402f2c715a14.tar.gz
Fix small memleaks in nis_passwd() and nis_group().
These only occur upon error. Code Review: https://reviews.freebsd.org/D1849 Reviewed by: delphij CID: 1016715 CID: 1016717
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/gen/getgrent.c4
-rw-r--r--lib/libc/gen/getpwent.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 4ba24ae..1f4d7e9 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1173,8 +1173,10 @@ nis_group(void *retval, void *mdata, va_list ap)
* terminator, alignment padding, and one (char *)
* pointer for the member list terminator.
*/
- if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *))
+ if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *)) {
+ free(result);
goto erange;
+ }
memcpy(buffer, result, resultlen);
buffer[resultlen] = '\0';
free(result);
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 6cd7eaf..0cb8ed2 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -1392,8 +1392,10 @@ nis_passwd(void *retval, void *mdata, va_list ap)
continue;
}
}
- if (resultlen >= bufsize)
+ if (resultlen >= bufsize) {
+ free(result);
goto erange;
+ }
memcpy(buffer, result, resultlen);
buffer[resultlen] = '\0';
free(result);
OpenPOWER on IntegriCloud