Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / nscd / nscd_getgr_r.c

diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index d9b91a470f0273709e57cdeae73d5af131046e7d..931d654a59f85fd2d15d9c3644ffa1aa40819878 100644 (file)
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 1998.
 
@@ -31,6 +31,7 @@
 #include <sys/un.h>
 #include <not-cancel.h>
 #include <_itoa.h>
+#include <scratch_buffer.h>
 
 #include "nscd-client.h"
 #include "nscd_proto.h"
@@ -89,7 +90,8 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
   int gc_cycle;
   int nretries = 0;
   const uint32_t *len = NULL;
-  size_t lensize = 0;
+  struct scratch_buffer lenbuf;
+  scratch_buffer_init (&lenbuf);
 
   /* If the mapping is available, try to search there instead of
      communicating with the nscd.  */
@@ -200,14 +202,10 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
          else
            {
              /* Allocate array to store lengths.  */
-             if (lensize == 0)
-               {
-                 lensize = gr_resp.gr_mem_cnt * sizeof (uint32_t);
-                 len = (uint32_t *) alloca (lensize);
-               }
-             else if (gr_resp.gr_mem_cnt * sizeof (uint32_t) > lensize)
-               len = extend_alloca (len, lensize,
-                                    gr_resp.gr_mem_cnt * sizeof (uint32_t));
+             if (!scratch_buffer_set_array_size
+                 (&lenbuf, gr_resp.gr_mem_cnt, sizeof (uint32_t)))
+               goto out_close;
+             len = lenbuf.data;
 
              vec[0].iov_base = (void *) len;
              vec[0].iov_len = gr_resp.gr_mem_cnt * sizeof (uint32_t);
@@ -326,5 +324,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
        goto retry;
     }
 
+  scratch_buffer_free (&lenbuf);
+
   return retval;
 }