summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-02-23 00:35:47 -0500
committerRich Felker <dalias@aerifal.cx>2015-02-23 00:35:47 -0500
commitfc5a96c9c8aa186effad7520d5df6b616bbfd29d (patch)
treeeeeba8f6c0cfdeafaa5955e29104850a9d7c8c68
parentd9da1fb8c592469431c764732d09f7756340190e (diff)
downloadmusl-fc5a96c9c8aa186effad7520d5df6b616bbfd29d.tar.gz
fix crashes in refactored passwd/group code
the wrong condition was used in determining the presence of a result that needs space/copying for the _r functions. a zero return value does not necessarily mean success; it can also be a non-error negative result: no such user/group.
-rw-r--r--src/passwd/getgr_r.c4
-rw-r--r--src/passwd/getpw_r.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/passwd/getgr_r.c b/src/passwd/getgr_r.c
index 68b867d8..7246e8a4 100644
--- a/src/passwd/getgr_r.c
+++ b/src/passwd/getgr_r.c
@@ -16,11 +16,11 @@ static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
rv = __getgr_a(name, gid, gr, &line, &len, &mem, &nmem, res);
- if (!rv && size < len + (nmem+1)*sizeof(char *) + 32) {
+ if (*res && size < len + (nmem+1)*sizeof(char *) + 32) {
*res = 0;
rv = ERANGE;
}
- if (!rv) {
+ if (*res) {
buf += (16-(uintptr_t)buf)%16;
gr->gr_mem = (void *)buf;
buf += (nmem+1)*sizeof(char *);
diff --git a/src/passwd/getpw_r.c b/src/passwd/getpw_r.c
index 0e71e43f..e8cc811e 100644
--- a/src/passwd/getpw_r.c
+++ b/src/passwd/getpw_r.c
@@ -13,11 +13,11 @@ static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, si
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
rv = __getpw_a(name, uid, pw, &line, &len, res);
- if (!rv && size < len) {
+ if (*res && size < len) {
*res = 0;
rv = ERANGE;
}
- if (!rv) {
+ if (*res) {
memcpy(buf, line, len);
FIX(name);
FIX(passwd);