RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-25 08:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crashes in refactored passwd/group code

Browse Source 
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.
This commit is contained in:
Rich Felker 2015-02-23 00:35:47 -05:00
parent d9da1fb8c5
commit fc5a96c9c8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/passwd/getgr_r.c
View File

@ -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 *);

4
src/passwd/getpw_r.c
View File

@ -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);