Index: src/backend/libpq/pqcomm.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/libpq/pqcomm.c,v
retrieving revision 1.157
diff -u -r1.157 pqcomm.c
--- src/backend/libpq/pqcomm.c	12 Jun 2003 07:36:51 -0000	1.157
+++ src/backend/libpq/pqcomm.c	22 Jul 2003 14:16:46 -0000
@@ -363,7 +363,7 @@
 		added++;
 	}
 
-	freeaddrinfo(addrs);
+	freeaddrinfo2(family, addrs);
 
 	if (!added)
 	{
Index: src/backend/utils/init/miscinit.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/utils/init/miscinit.c,v
retrieving revision 1.104
diff -u -r1.104 miscinit.c
--- src/backend/utils/init/miscinit.c	27 Jun 2003 19:08:37 -0000	1.104
+++ src/backend/utils/init/miscinit.c	22 Jul 2003 14:16:46 -0000
@@ -673,8 +673,15 @@
 static void
 UnlinkLockFile(int status, Datum filename)
 {
-	unlink((char *) DatumGetPointer(filename));
-	/* Should we complain if the unlink fails? */
+  char *fname = (char *)DatumGetPointer(filename);
+  if( fname != NULL )
+    {
+      if( unlink(fname) != 0 )
+	{
+	  /* Should we complain if the unlink fails? */
+	}
+      free(fname);
+    }
 }
 
 /*