This patch fixes two tiny memory leaks in pg_dump and two in pg_dumpall.

bmomjian · bmomjian · commit 3026493ff299 · 2002-11-29T16:38:42.000Z
Neil Conway
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  *	by PostgreSQL
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.308 2002/11/23 03:59:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.309 2002/11/29 16:38:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3226,6 +3226,7 @@ dumpOneDomain(Archive *fout, TypeInfo *tinfo)
 					  "WHERE contypid = '%s'::pg_catalog.oid",
 					  tinfo->oid);
 
+	PQclear(res);
 	res = PQexec(g_conn, chkquery->data);
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -3269,6 +3270,7 @@ dumpOneDomain(Archive *fout, TypeInfo *tinfo)
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
 	destroyPQExpBuffer(query);
+	destroyPQExpBuffer(chkquery);
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.10 2002/11/22 03:09:43 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.11 2002/11/29 16:38:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -403,7 +403,7 @@ dumpCreateDB(PGconn *conn)
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
-		PQExpBuffer buf = createPQExpBuffer();
+		PQExpBuffer buf;
 		char	   *dbname = PQgetvalue(res, i, 0);
 		char	   *dbowner = PQgetvalue(res, i, 1);
 		char	   *dbencoding = PQgetvalue(res, i, 2);
@@ -413,6 +413,8 @@ dumpCreateDB(PGconn *conn)
 		if (strcmp(dbname, "template1") == 0)
 			continue;
 
+		buf = createPQExpBuffer();
+
 		if (output_clean)
 			appendPQExpBuffer(buf, "DROP DATABASE %s\n;", fmtId(dbname));
 
@@ -692,6 +694,7 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
 			exit(1);
 		}
 	}
+	PQclear(res);
 
 	return conn;
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.10 2002/11/22 03:09:43 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.11 2002/11/29 16:38:42 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -403,7 +403,7 @@ dumpCreateDB(PGconn *conn)`
`403`	`403`
`404`	`404`	`for (i = 0; i < PQntuples(res); i++)`
`405`	`405`	`{`
`406`		`- PQExpBuffer buf = createPQExpBuffer();`
	`406`	`+ PQExpBuffer buf;`
`407`	`407`	`char *dbname = PQgetvalue(res, i, 0);`
`408`	`408`	`char *dbowner = PQgetvalue(res, i, 1);`
`409`	`409`	`char *dbencoding = PQgetvalue(res, i, 2);`
`@@ -413,6 +413,8 @@ dumpCreateDB(PGconn *conn)`
`413`	`413`	`if (strcmp(dbname, "template1") == 0)`
`414`	`414`	`continue;`
`415`	`415`
	`416`	`+ buf = createPQExpBuffer();`
	`417`	`+`
`416`	`418`	`if (output_clean)`
`417`	`419`	`appendPQExpBuffer(buf, "DROP DATABASE %s\n;", fmtId(dbname));`
`418`	`420`
`@@ -692,6 +694,7 @@ connectDatabase(const char dbname, const char pghost, const char *pgport,`
`692`	`694`	`exit(1);`
`693`	`695`	`}`
`694`	`696`	`}`
	`697`	`+ PQclear(res);`
`695`	`698`
`696`	`699`	`return conn;`
`697`	`700`	`}`