Tom, happier with the attached patch?

bmomjian · bmomjian · commit 440953e6cde3 · 2003-07-27T19:39:13.000Z
I'd have to disagree with regards to the memory leaks not being worth
a mention - any such leak can cause problems when the PostgreSQL
installation is either unattended, long-living andor has very high
connection levels. Half a kilobyte on start-up isn't negligible in
this light.

Regards, Lee.

Tom Lane writes:
 &gt; Lee Kindness &lt;lkindness@csl.co.uk&gt; writes:
 &gt; &gt; Guys, attached is a patch to fix two memory leaks on start-up.
 &gt;
 &gt; I do not like the changes to miscinit.c.  In the first place, it is not
 &gt; a "memory leak" to do a one-time allocation of state for a proc_exit
 &gt; function.  A bigger complaint is that your proposed change introduces
 &gt; fragile coupling between CreateLockFile and its callers, in order to
 &gt; save no resources worth mentioning.  More, it introduces an assumption
 &gt; that the globals directoryLockFile and socketLockFile don't change while
 &gt; the postmaster is running.  UnlinkLockFile should unlink the file that
 &gt; it was originally told to unlink, regardless of what happens to those
 &gt; globals.
 &gt;
 &gt; If you are intent on spending code to free stuff just before the
 &gt; postmaster exits, a better fix would be for UnlinkLockFile to free its
 &gt; string argument after using it.

Lee Kindness
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.105 2003/07/25 20:17:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.106 2003/07/27 19:39:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -685,8 +685,15 @@ GetUserNameFromId(AclId userid)
 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);
+    }
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.105 2003/07/25 20:17:52 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.106 2003/07/27 19:39:13 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -685,8 +685,15 @@ GetUserNameFromId(AclId userid)`
`685`	`685`	`static void`
`686`	`686`	`UnlinkLockFile(int status, Datum filename)`
`687`	`687`	`{`
`688`		`- unlink((char *) DatumGetPointer(filename));`
`689`		`- /* Should we complain if the unlink fails? */`
	`688`	`+ char fname = (char )DatumGetPointer(filename);`
	`689`	`+ if( fname != NULL )`
	`690`	`+ {`
	`691`	`+ if( unlink(fname) != 0 )`
	`692`	`+ {`
	`693`	`+ /* Should we complain if the unlink fails? */`
	`694`	`+ }`
	`695`	`+ free(fname);`
	`696`	`+ }`
`690`	`697`	`}`
`691`	`698`
`692`	`699`	`/*`