From d8fe3fc2e5c0a164599b6947050931c0a4ec213f Mon Sep 17 00:00:00 2001
Message-Id: <d8fe3fc2e5c0a164599b6947050931c0a4ec213f.1714040811.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 15 Aug 2000 17:35:02 +0000
Subject: [PATCH] (gethost, and others): Since @gethost@ actually uses @malloc@
 rather than @xmalloc@, it's wrong to use @xfree@ on the result.  Fixed the
 code to use the right freeing function on the right data.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 bres.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/bres.c b/bres.c
index 4971153..a1d2c54 100644
--- a/bres.c
+++ b/bres.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: bres.c,v 1.3 2000/06/17 10:38:35 mdw Exp $
+ * $Id: bres.c,v 1.4 2000/08/15 17:35:02 mdw Exp $
  *
  * Background reverse name resolution
  *
@@ -30,6 +30,11 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: bres.c,v $
+ * Revision 1.4  2000/08/15 17:35:02  mdw
+ * (gethost, and others): Since @gethost@ actually uses @malloc@ rather
+ * than @xmalloc@, it's wrong to use @xfree@ on the result.  Fixed the code
+ * to use the right freeing function on the right data.
+ *
  * Revision 1.3  2000/06/17 10:38:35  mdw
  * Track changes to selbuf interface.
  *
@@ -319,15 +324,15 @@ static struct hostent *gethost(int fd)
 
     h->h_name = a;
     PUT(name);
-    xfree(name);
+    free(name);
     h->h_aliases = p;
     for (i = 0; i < hsk.nalias; i++) {
       *p++ = a;
       PUT(alias[i]);
-      xfree(alias[i]);
+      free(alias[i]);
     }
     *p++ = 0;
-    xfree(alias);
+    free(alias);
  
 #undef PUT
   }
@@ -340,11 +345,11 @@ tidy_2:
   {
     int i;
     for (i = 0; i < hsk.nalias && alias[i]; i++)
-      xfree(alias[i]);
-    xfree(alias);
+      free(alias[i]);
+    free(alias);
   }
 tidy_1:
-  xfree(name);
+  free(name);
 tidy_0:
   return (0);
 }
@@ -453,7 +458,7 @@ static void child(int rfd, int cfd)
 	free(name);
       }	break;
 
-      /* --- Forward lookup --- */
+      /* --- Reverse lookup --- */
 
       case BRES_BYADDR: {
 	struct in_addr addr;
@@ -669,7 +674,7 @@ static void answer(int fd, unsigned mode, void *vp)
       xfree(rc->u.name);
   }
   if (h)
-    xfree(h);
+    free(h);
   if (fail)
     zap(rs);
   if (!rc)
-- 
[mdw]