Suppress memory leak in COPY WITH OIDS TO wherever.

tglsfdc · tglsfdc · commit 5ac1eac2a635 · 2000-06-28T06:05:36.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.115 2000/06/17 21:48:42 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.116 2000/06/28 06:05:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -475,10 +475,11 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim, char *null_p
 
 		if (oids && !binary)
 		{
-			CopySendString(DatumGetCString(DirectFunctionCall1(oidout,
-									ObjectIdGetDatum(tuple->t_data->t_oid))),
-						   fp);
+			string = DatumGetCString(DirectFunctionCall1(oidout,
+									 ObjectIdGetDatum(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.115 2000/06/17 21:48:42 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.116 2000/06/28 06:05:36 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -475,10 +475,11 @@ CopyTo(Relation rel, bool binary, bool oids, FILE fp, char delim, char *null_p`
`475`	`475`
`476`	`476`	`if (oids && !binary)`
`477`	`477`	`{`
`478`		`- CopySendString(DatumGetCString(DirectFunctionCall1(oidout,`
`479`		`- ObjectIdGetDatum(tuple->t_data->t_oid))),`
`480`		`- fp);`
	`478`	`+ string = DatumGetCString(DirectFunctionCall1(oidout,`
	`479`	`+ ObjectIdGetDatum(tuple->t_data->t_oid)));`
	`480`	`+ CopySendString(string, fp);`
`481`	`481`	`CopySendChar(delim[0], fp);`
	`482`	`+ pfree(string);`
`482`	`483`	`}`
`483`	`484`
`484`	`485`	`for (i = 0; i < attr_count; i++)`