Fix case in which a debug printout would print already-pfreed data.

tglsfdc · tglsfdc · commit 4cd4ed0cc290 · 2005-05-07T18:14:25.000Z
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
@@ -31,7 +31,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.2 2005/05/03 19:42:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.3 2005/05/07 18:14:25 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -310,9 +310,9 @@ MultiXactIdExpand(MultiXactId multi, TransactionId xid)
 	{
 		if (TransactionIdEquals(members[i], xid))
 		{
-			pfree(members);
 			debug_elog4(DEBUG2, "Expand: %u is already a member of %u",
 						xid, multi);
+			pfree(members);
 			return multi;
 		}
 	}
@@ -376,8 +376,8 @@ MultiXactIdIsRunning(MultiXactId multi)
 	{
 		if (TransactionIdEquals(members[i], myXid))
 		{
-			pfree(members);
 			debug_elog3(DEBUG2, "IsRunning: I (%d) am running!", i);
+			pfree(members);
 			return true;
 		}
 	}
@@ -391,14 +391,15 @@ MultiXactIdIsRunning(MultiXactId multi)
 	{
 		if (TransactionIdIsInProgress(members[i]))
 		{
-			pfree(members);
 			debug_elog4(DEBUG2, "IsRunning: member %d (%u) is running",
-					i, members[i]);
+						i, members[i]);
+			pfree(members);
 			return true;
 		}
 	}
 
 	pfree(members);
+
 	debug_elog3(DEBUG2, "IsRunning: %u is not running", multi);
 
 	return false;
@@ -646,6 +647,7 @@ CreateMultiXactId(int nxids, TransactionId *xids)
 
 	/* Store the new MultiXactId in the local cache, too */
 	mXactCachePut(multi, nxids, xids);
+
 	debug_elog2(DEBUG2, "Create: all done");
 
 	return multi;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`32`	`32`	`* Portions Copyright (c) 1994, Regents of the University of California`
`33`	`33`	`*`
`34`		`- * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.2 2005/05/03 19:42:40 tgl Exp $`
	`34`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.3 2005/05/07 18:14:25 tgl Exp $`
`35`	`35`	`*`
`36`	`36`	`*-------------------------------------------------------------------------`
`37`	`37`	`*/`
`@@ -310,9 +310,9 @@ MultiXactIdExpand(MultiXactId multi, TransactionId xid)`
`310`	`310`	`{`
`311`	`311`	`if (TransactionIdEquals(members[i], xid))`
`312`	`312`	`{`
`313`		`- pfree(members);`
`314`	`313`	`debug_elog4(DEBUG2, "Expand: %u is already a member of %u",`
`315`	`314`	`xid, multi);`
	`315`	`+ pfree(members);`
`316`	`316`	`return multi;`
`317`	`317`	`}`
`318`	`318`	`}`
`@@ -376,8 +376,8 @@ MultiXactIdIsRunning(MultiXactId multi)`
`376`	`376`	`{`
`377`	`377`	`if (TransactionIdEquals(members[i], myXid))`
`378`	`378`	`{`
`379`		`- pfree(members);`
`380`	`379`	`debug_elog3(DEBUG2, "IsRunning: I (%d) am running!", i);`
	`380`	`+ pfree(members);`
`381`	`381`	`return true;`
`382`	`382`	`}`
`383`	`383`	`}`
`@@ -391,14 +391,15 @@ MultiXactIdIsRunning(MultiXactId multi)`
`391`	`391`	`{`
`392`	`392`	`if (TransactionIdIsInProgress(members[i]))`
`393`	`393`	`{`
`394`		`- pfree(members);`
`395`	`394`	`debug_elog4(DEBUG2, "IsRunning: member %d (%u) is running",`
`396`		`- i, members[i]);`
	`395`	`+ i, members[i]);`
	`396`	`+ pfree(members);`
`397`	`397`	`return true;`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`pfree(members);`
	`402`	`+`
`402`	`403`	`debug_elog3(DEBUG2, "IsRunning: %u is not running", multi);`
`403`	`404`
`404`	`405`	`return false;`
`@@ -646,6 +647,7 @@ CreateMultiXactId(int nxids, TransactionId *xids)`
`646`	`647`
`647`	`648`	`/* Store the new MultiXactId in the local cache, too */`
`648`	`649`	`mXactCachePut(multi, nxids, xids);`
	`650`	`+`
`649`	`651`	`debug_elog2(DEBUG2, "Create: all done");`
`650`	`652`
`651`	`653`	`return multi;`