drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* grp.cc (getgroups): fail with EINVAL if array is not large 

enough to hold all supplementary group IDs.
This commit is contained in:
DJ Delorie 2000-08-29 18:59:26 +00:00
parent 00a2f168e7
commit 4f2aac14aa
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-29 Egor Duda <deo@logos-m.ru>
* grp.cc (getgroups): fail with EINVAL if array is not large
enough to hold all supplementary group IDs.
Mon Aug 28 22:03:21 2000 Christopher Faylor <cgf@cygnus.com> Mon Aug 28 22:03:21 2000 Christopher Faylor <cgf@cygnus.com>
* signal.cc (_raise): New function. * signal.cc (_raise): New function.

15
winsup/cygwin/grp.cc
View File

@ -15,10 +15,12 @@ details. */
#include <grp.h> #include <grp.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h>
#include "thread.h" #include "thread.h"
#include "sync.h" #include "sync.h"
#include "sigproc.h" #include "sigproc.h"
#include "pinfo.h" #include "pinfo.h"
#include "cygerrno.h"
/* Read /etc/group only once for better performance. This is done /* Read /etc/group only once for better performance. This is done
on the first call that needs information from it. */ on the first call that needs information from it. */
@ -248,8 +250,8 @@ getgroups (int gidsetsize, gid_t *grouplist, gid_t gid, const char *username)
if (cnt < gidsetsize) if (cnt < gidsetsize)
grouplist[cnt] = group_buf[i].gr_gid; grouplist[cnt] = group_buf[i].gr_gid;
++cnt; ++cnt;
if (gidsetsize && cnt >= gidsetsize) if (gidsetsize && cnt > gidsetsize)
goto out; goto error;
} }
else if (group_buf[i].gr_mem) else if (group_buf[i].gr_mem)
for (int gi = 0; group_buf[i].gr_mem[gi]; ++gi) for (int gi = 0; group_buf[i].gr_mem[gi]; ++gi)
@ -258,11 +260,14 @@ getgroups (int gidsetsize, gid_t *grouplist, gid_t gid, const char *username)
if (cnt < gidsetsize) if (cnt < gidsetsize)
grouplist[cnt] = group_buf[i].gr_gid; grouplist[cnt] = group_buf[i].gr_gid;
++cnt; ++cnt;
if (gidsetsize && cnt >= gidsetsize) if (gidsetsize && cnt > gidsetsize)
goto out; goto error;
} }
out:
return cnt; return cnt;
error:
set_errno ( EINVAL );
return -1;
} }
extern "C" extern "C"