Back-patch COPY WITH OIDS leak fix.

tglsfdc · tglsfdc · commit d914334dd693 · 2000-06-28T06:13:01.000Z
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.106.2.1 2000/06/05 11:13:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.106.2.2 2000/06/28 06:13:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -484,8 +484,10 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim, char *null_p
 
 		if (oids && !binary)
 		{
-			CopySendString(oidout(tuple->t_data->t_oid), fp);
+			string = oidout(tuple->t_data->t_oid);
+			CopySendString(string, fp);
 			CopySendChar(delim[0], fp);
+			pfree(string);
 		}
 
 		for (i = 0; i < attr_count; i++)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.106.2.1 2000/06/05 11:13:55 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.106.2.2 2000/06/28 06:13:01 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -484,8 +484,10 @@ CopyTo(Relation rel, bool binary, bool oids, FILE fp, char delim, char *null_p`
`484`	`484`
`485`	`485`	`if (oids && !binary)`
`486`	`486`	`{`
`487`		`- CopySendString(oidout(tuple->t_data->t_oid), fp);`
	`487`	`+ string = oidout(tuple->t_data->t_oid);`
	`488`	`+ CopySendString(string, fp);`
`488`	`489`	`CopySendChar(delim[0], fp);`
	`490`	`+ pfree(string);`
`489`	`491`	`}`
`490`	`492`
`491`	`493`	`for (i = 0; i < attr_count; i++)`