From fc5a96c9c8aa186effad7520d5df6b616bbfd29d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 23 Feb 2015 00:35:47 -0500 Subject: 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. --- src/passwd/getgr_r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/passwd/getgr_r.c') 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 *); -- cgit v1.2.1