Set reasonable limits for xdr_requests.

[thirdparty/glibc.git] / nis / nis_checkpoint.c

diff --git a/nis/nis_checkpoint.c b/nis/nis_checkpoint.c
index f4bd07252c87fb7589a327fc6c479858f08931ed..f344d8cbf85f3beeef962d1caab75be185df9e5e 100644 (file)
--- a/nis/nis_checkpoint.c
+++ b/nis/nis_checkpoint.c
@@ -1,46 +1,52 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA. */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
+#include <string.h>
 #include <rpcsvc/nis.h>
+
+#include "nis_xdr.h"
 #include "nis_intern.h"
 
 nis_result *
-nis_checkpoint(const_nis_name dirname)
+nis_checkpoint (const_nis_name dirname)
 {
   nis_result *res;
 
   res = calloc (1, sizeof (nis_result));
+  if (res == NULL)
+    return NULL;
 
   if (dirname != NULL)
     {
-      cp_result *cpres = NULL;
       nis_result *res2;
       u_int i;
 
       res2 = nis_lookup (dirname, EXPAND_NAME);
       if (NIS_RES_STATUS (res2) != NIS_SUCCESS)
-        return res2;
+       {
+         free (res);
+         return res2;
+       }
 
       /* Check if obj is really a diryectory object */
       if (__type_of (NIS_RES_OBJECT (res2)) != NIS_DIRECTORY_OBJ)
        {
-         nis_freeresult (res);
+         nis_freeresult (res2);
          NIS_RES_STATUS (res) = NIS_INVALIDOBJ;
          return res;
        }
@@ -48,16 +54,19 @@ nis_checkpoint(const_nis_name dirname)
       for (i = 0;
           i < NIS_RES_OBJECT (res2)->DI_data.do_servers.do_servers_len; ++i)
        {
+         cp_result cpres;
+
+         memset (&cpres, '\0', sizeof (cp_result));
          if (__do_niscall2 (&NIS_RES_OBJECT(res2)->DI_data.do_servers.do_servers_val[i],
-                            1, NIS_CHECKPOINT, (xdrproc_t) xdr_nis_name,
-                            (caddr_t) &dirname, (xdrproc_t) xdr_cp_result,
-                            (caddr_t) &cpres, 0, NULL) != RPC_SUCCESS)
+                            1, NIS_CHECKPOINT, (xdrproc_t) _xdr_nis_name,
+                            (caddr_t) &dirname, (xdrproc_t) _xdr_cp_result,
+                            (caddr_t) &cpres, 0, NULL) != NIS_SUCCESS)
            NIS_RES_STATUS (res) = NIS_RPCERROR;
          else
            {
-             res->status += cpres->cp_status;
-             res->zticks += cpres->cp_zticks;
-             res->dticks += cpres->cp_dticks;
+             NIS_RES_STATUS (res) = cpres.cp_status;
+             res->zticks += cpres.cp_zticks;
+             res->dticks += cpres.cp_dticks;
            }
        }
       nis_freeresult (res2);