libexport.a: Allow malloc(3) failures in client_lookup() and friends

[nfs-utils.git] / support / export / client.c

diff --git a/support/export/client.c b/support/export/client.c
index 8f83da31526a6e1f21e59a7d8c9718703b4a5a79..eafc2bfa6d79f3f5a532d23717a9a2df5c666a91 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <netdb.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -55,8 +55,8 @@ init_addrlist(nfs_client *clp, const struct hostent *hp)
 static void
 client_free(nfs_client *clp)
 {
-       xfree(clp->m_hostname);
-       xfree(clp);
+       free(clp->m_hostname);
+       free(clp);
 }
 
 /* if canonical is set, then we *know* this is already a canonical name
@@ -111,9 +111,10 @@ client_lookup(char *hname, int canonical)
                }
        }
 
-       if (!clp) {
-               clp = (nfs_client *) xmalloc(sizeof(*clp));
-               memset(clp, 0, sizeof(*clp));
+       if (clp == NULL) {
+               clp = calloc(1, sizeof(*clp));
+               if (clp == NULL)
+                       goto out;
                clp->m_type = htype;
                if (!client_init(clp, hname, NULL)) {
                        client_free(clp);
@@ -138,7 +139,9 @@ client_dup(nfs_client *clp, struct hostent *hp)
 {
        nfs_client              *new;
 
-       new = (nfs_client *) xmalloc(sizeof(*new));
+       new = (nfs_client *)malloc(sizeof(*new));
+       if (new == NULL)
+               return NULL;
        memcpy(new, clp, sizeof(*new));
        new->m_type = MCL_FQDN;
        new->m_hostname = NULL;
@@ -154,11 +157,9 @@ client_dup(nfs_client *clp, struct hostent *hp)
 static int
 client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 {
-       xfree(clp->m_hostname);
-       if (hp)
-               clp->m_hostname = xstrdup(hp->h_name);
-       else
-               clp->m_hostname = xstrdup(hname);
+       clp->m_hostname = strdup(hname);
+       if (clp->m_hostname == NULL)
+               return 0;
 
        clp->m_exported = 0;
        clp->m_count = 0;