projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade allocsa module from GNU gettext.
[gnulib.git]
/
lib
/
getgroups.c
diff --git
a/lib/getgroups.c
b/lib/getgroups.c
index
f6808b3
..
0f951b7
100644
(file)
--- a/
lib/getgroups.c
+++ b/
lib/getgroups.c
@@
-20,6
+20,8
@@
#include <config.h>
#include <stdio.h>
#include <sys/types.h>
#include <config.h>
#include <stdio.h>
#include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>
#include "xalloc.h"
#include "xalloc.h"
@@
-29,10
+31,11
@@
provided function handle all others. */
int
provided function handle all others. */
int
-getgroups (
size_
t n, GETGROUPS_T *group)
+getgroups (
in
t n, GETGROUPS_T *group)
{
int n_groups;
GETGROUPS_T *gbuf;
{
int n_groups;
GETGROUPS_T *gbuf;
+ int saved_errno;
#undef getgroups
#undef getgroups
@@
-40,17
+43,22
@@
getgroups (size_t n, GETGROUPS_T *group)
return getgroups (n, group);
n = 20;
return getgroups (n, group);
n = 20;
- gbuf = NULL;
while (1)
{
while (1)
{
- gbuf = xrealloc (gbuf, n * sizeof (GETGROUPS_T));
+ /* No need to worry about address arithmetic overflow here,
+ since the ancient systems that we're running on have low
+ limits on the number of secondary groups. */
+ gbuf = xmalloc (n * sizeof *gbuf);
n_groups = getgroups (n, gbuf);
if (n_groups < n)
break;
n_groups = getgroups (n, gbuf);
if (n_groups < n)
break;
+ free (gbuf);
n += 10;
}
n += 10;
}
+ saved_errno = errno;
free (gbuf);
free (gbuf);
+ errno = saved_errno;
return n_groups;
}
return n_groups;
}