Paranoia about data structure lifetime ...

tglsfdc · tglsfdc · commit 04cb9a6a16ed · 2002-02-27T19:52:41.000Z
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.48 2002/02/27 19:35:16 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.49 2002/02/27 19:52:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -158,7 +158,6 @@ ProcessQuery(Query *parsetree,
 		if (parsetree->isPortal)
 		{
 			isRetrieveIntoPortal = true;
-			intoName = parsetree->into;
 			/* If binary portal, switch to alternate output format */
 			if (dest == Remote && parsetree->isBinary)
 				dest = RemoteInternal;
@@ -182,10 +181,12 @@ ProcessQuery(Query *parsetree,
 	 */
 	if (isRetrieveIntoPortal)
 	{
+		intoName = parsetree->into;
 		portal = PreparePortal(intoName);
 		oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
 		parsetree = copyObject(parsetree);
 		plan = copyObject(plan);
+		intoName = parsetree->into;	/* use copied name in QueryDesc */
 
 		/*
 		 * We stay in portal's memory context for now, so that query desc,

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/tcop/pquery.c,v 1.48 2002/02/27 19:35:16 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.49 2002/02/27 19:52:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -158,7 +158,6 @@ ProcessQuery(Query *parsetree,`
`158`	`158`	`if (parsetree->isPortal)`
`159`	`159`	`{`
`160`	`160`	`isRetrieveIntoPortal = true;`
`161`		`- intoName = parsetree->into;`
`162`	`161`	`/* If binary portal, switch to alternate output format */`
`163`	`162`	`if (dest == Remote && parsetree->isBinary)`
`164`	`163`	`dest = RemoteInternal;`
`@@ -182,10 +181,12 @@ ProcessQuery(Query *parsetree,`
`182`	`181`	`*/`
`183`	`182`	`if (isRetrieveIntoPortal)`
`184`	`183`	`{`
	`184`	`+ intoName = parsetree->into;`
`185`	`185`	`portal = PreparePortal(intoName);`
`186`	`186`	`oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));`
`187`	`187`	`parsetree = copyObject(parsetree);`
`188`	`188`	`plan = copyObject(plan);`
	`189`	`+ intoName = parsetree->into; /* use copied name in QueryDesc */`
`189`	`190`
`190`	`191`	`/*`
`191`	`192`	`* We stay in portal's memory context for now, so that query desc,`