2.5-18.1

[jlayton/glibc.git] / sunrpc / xdr_array.c

diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
index 9f67e7fe62a16aad876d1fdbaa58698dbac6e02b..44abdbcfda4df10eccde199812a2da000ea8b9a5 100644 (file)
--- a/sunrpc/xdr_array.c
+++ b/sunrpc/xdr_array.c
@@ -74,7 +74,6 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
   caddr_t target = *addrp;
   u_int c;             /* the actual element count */
   bool_t stat = TRUE;
-  u_int nodesize;
 
   /* like strings, arrays are really counted arrays */
   if (!INTUSE(xdr_u_int) (xdrs, sizep))
@@ -90,7 +89,6 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
     {
       return FALSE;
     }
-  nodesize = c * elsize;
 
   /*
    * if we are deserializing, we may need to allocate an array.
@@ -102,19 +100,12 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
       case XDR_DECODE:
        if (c == 0)
          return TRUE;
-       *addrp = target = mem_alloc (nodesize);
+       *addrp = target = calloc (c, elsize);
        if (target == NULL)
          {
-#ifdef USE_IN_LIBIO
-           if (_IO_fwide (stderr, 0) > 0)
-             (void) __fwprintf (stderr, L"%s",
-                                _("xdr_array: out of memory\n"));
-           else
-#endif
-             (void) fputs (_("xdr_array: out of memory\n"), stderr);
+           (void) __fxprintf (NULL, "%s", _("xdr_array: out of memory\n"));
            return FALSE;
          }
-       __bzero (target, nodesize);
        break;
 
       case XDR_FREE:
@@ -137,7 +128,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
    */
   if (xdrs->x_op == XDR_FREE)
     {
-      mem_free (*addrp, nodesize);
+      mem_free (*addrp, c * elsize);
       *addrp = NULL;
     }
   return stat;