aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2015-04-08 20:55:02 +0200
committerFlorian Weimer <fweimer@redhat.com>2015-04-08 21:07:24 +0200
commit794a74af4da66ecde74d8e298e03b3b578a1ed33 (patch)
treee67e802d9385ab5c577eec241fdc0fb7450528ea
parent866ba63b312fd015e1585ee46943f57187e82868 (diff)
downloadglibc-794a74af4da66ecde74d8e298e03b3b578a1ed33.zip
glibc-794a74af4da66ecde74d8e298e03b3b578a1ed33.tar.gz
glibc-794a74af4da66ecde74d8e298e03b3b578a1ed33.tar.bz2
_nss_compat_initgroups_dyn: Use struct scratch_buffer instead of extend_alloca
-rw-r--r--ChangeLog2
-rw-r--r--nis/nss_compat/compat-initgroups.c29
2 files changed, 9 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 3da105b..f9c5f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
scratch_buffer instead of extend_alloca.
* nscd/initgrcache.c: Include <scratch_buffer.h>, now needed by
grp/compat-initgroups.c.
+ * nis/nss_compat/compat-initgroups.c (_nss_compat_initgroups_dyn):
+ Rewrite to use struct scratch_buffer instead of extend_alloca.
2015-04-08 Joseph Myers <joseph@codesourcery.com>
diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c
index 2f8ba72..eaff0f6 100644
--- a/nis/nss_compat/compat-initgroups.c
+++ b/nis/nss_compat/compat-initgroups.c
@@ -16,7 +16,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <alloca.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -30,6 +29,7 @@
#include <nsswitch.h>
#include <bits/libc-lock.h>
#include <kernel-features.h>
+#include <scratch_buffer.h>
static service_user *ni;
/* Type of the lookup function. */
@@ -528,46 +528,31 @@ _nss_compat_initgroups_dyn (const char *user, gid_t group, long int *start,
long int *size, gid_t **groupsp, long int limit,
int *errnop)
{
- size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
- char *tmpbuf;
enum nss_status status;
ent_t intern = { true, false, false, NULL, {NULL, 0, 0} };
- bool use_malloc = false;
status = internal_setgrent (&intern);
if (status != NSS_STATUS_SUCCESS)
return status;
- tmpbuf = __alloca (buflen);
+ struct scratch_buffer tmpbuf;
+ scratch_buffer_init (&tmpbuf);
do
{
- while ((status = internal_getgrent_r (&intern, tmpbuf, buflen,
+ while ((status = internal_getgrent_r (&intern, tmpbuf.data, tmpbuf.length,
user, group, start, size,
groupsp, limit, errnop))
== NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- if (__libc_use_alloca (buflen * 2))
- tmpbuf = extend_alloca (tmpbuf, buflen, 2 * buflen);
- else
- {
- buflen *= 2;
- char *newbuf = realloc (use_malloc ? tmpbuf : NULL, buflen);
- if (newbuf == NULL)
- {
- status = NSS_STATUS_TRYAGAIN;
- goto done;
- }
- use_malloc = true;
- tmpbuf = newbuf;
- }
+ if (!scratch_buffer_grow (&tmpbuf))
+ goto done;
}
while (status == NSS_STATUS_SUCCESS);
status = NSS_STATUS_SUCCESS;
done:
- if (use_malloc)
- free (tmpbuf);
+ scratch_buffer_free (&tmpbuf);
internal_endgrent (&intern);