Update copyright dates with scripts/update-copyrights.

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

diff --git a/nis/nis_getservlist.c b/nis/nis_getservlist.c
index 1629c24053a80417e2abd46f45c3699bf3f891c8..4b227c59abe64249422cac05c6782523b91f02ff 100644 (file)
--- a/nis/nis_getservlist.c
+++ b/nis/nis_getservlist.c
@@ -1,24 +1,26 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997-2020 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
+   <https://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
+
+#include "nis_xdr.h"
 #include "nis_intern.h"
 
 nis_server **
@@ -29,32 +31,77 @@ nis_getservlist (const_nis_name dir)
 
   res = nis_lookup (dir, FOLLOW_LINKS);
 
-  if (NIS_RES_STATUS (res) == NIS_SUCCESS)
+  if (res != NULL && NIS_RES_STATUS (res) == NIS_SUCCESS)
     {
       unsigned long i;
       nis_server *server;
 
       serv =
-       calloc (1, sizeof (nis_server *) *
+       malloc (sizeof (nis_server *) *
                (NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_len + 1));
-      if (serv == NULL)
-       return NULL;
+      if (__glibc_unlikely (serv == NULL))
+       {
+         nis_freeresult (res);
+         return NULL;
+       }
+
       for (i = 0; i < NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_len;
           ++i)
        {
          server =
            &NIS_RES_OBJECT (res)->DI_data.do_servers.do_servers_val[i];
          serv[i] = calloc (1, sizeof (nis_server));
+         if (__glibc_unlikely (serv[i] == NULL))
+           {
+           free_all:
+             while (i-- > 0)
+               {
+                 free (serv[i]->pkey.n_bytes);
+                 if (serv[i]->ep.ep_val != NULL)
+                   {
+                     unsigned long int j;
+                     for (j = 0; j < serv[i]->ep.ep_len; ++j)
+                       {
+                         free (serv[i]->ep.ep_val[j].proto);
+                         free (serv[i]->ep.ep_val[j].family);
+                         free (serv[i]->ep.ep_val[j].uaddr);
+                       }
+                     free (serv[i]->ep.ep_val);
+                   }
+                 free (serv[i]->name);
+                 free (serv[i]);
+               }
+
+             free (serv);
+
+             nis_freeresult (res);
+
+             return NULL;
+           }
+
          if (server->name != NULL)
-            serv[i]->name = strdup (server->name);
+           {
+             serv[i]->name = strdup (server->name);
+             if (__glibc_unlikely (serv[i]->name == NULL))
+               {
+                 ++i;
+                 goto free_all;
+               }
+           }
 
           serv[i]->ep.ep_len = server->ep.ep_len;
           if (serv[i]->ep.ep_len > 0)
             {
-              unsigned long j;
+              unsigned long int j;
 
               serv[i]->ep.ep_val =
                malloc (server->ep.ep_len * sizeof (endpoint));
+             if (__glibc_unlikely (serv[i]->ep.ep_val == NULL))
+               {
+                 ++i;
+                 goto free_all;
+               }
+
               for (j = 0; j < serv[i]->ep.ep_len; ++j)
                 {
                   if (server->ep.ep_val[j].uaddr)
@@ -74,31 +121,35 @@ nis_getservlist (const_nis_name dir)
                    serv[i]->ep.ep_val[j].proto = NULL;
                 }
             }
-          else
-           serv[i]->ep.ep_val = NULL;
+
           serv[i]->key_type = server->key_type;
           serv[i]->pkey.n_len = server->pkey.n_len;
           if (server->pkey.n_len > 0)
             {
-              serv[i]->pkey.n_bytes =
-                malloc (server->pkey.n_len);
-              if (serv[i]->pkey.n_bytes == NULL)
-                return NULL;
+              serv[i]->pkey.n_bytes = malloc (server->pkey.n_len);
+              if (__glibc_unlikely (serv[i]->pkey.n_bytes == NULL))
+               {
+                 ++i;
+                 goto free_all;
+               }
               memcpy (serv[i]->pkey.n_bytes, server->pkey.n_bytes,
                       server->pkey.n_len);
             }
-          else
-            serv[i]->pkey.n_bytes = NULL;
         }
+      serv[i] = NULL;
     }
   else
     {
       serv = malloc (sizeof (nis_server *));
-      if (serv != NULL)
+      if (__glibc_unlikely (serv != NULL))
        serv[0] = NULL;
     }
+
+  nis_freeresult (res);
+
   return serv;
 }
+libnsl_hidden_nolink_def (nis_getservlist, GLIBC_2_1)
 
 void
 nis_freeservlist (nis_server **serv)
@@ -111,9 +162,10 @@ nis_freeservlist (nis_server **serv)
   i = 0;
   while (serv[i] != NULL)
     {
-      xdr_free ((xdrproc_t)xdr_nis_server, (char *)serv[i]);
+      xdr_free ((xdrproc_t)_xdr_nis_server, (char *)serv[i]);
       free (serv[i]);
       ++i;
     }
   free (serv);
 }
+libnsl_hidden_nolink_def (nis_freeservlist, GLIBC_2_1)