Repair multiple memory leaks in getTables(), including one that could

tglsfdc · tglsfdc · commit 3c06653fbd58 · 2004-03-20T18:12:50.000Z
easily exhaust memory on databases with more than a few hundred triggers.
I don't expect any more releases of these old versions, but let's put the
fix in CVS just so it's archived.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.4 2001/08/03 20:14:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.5 2004/03/20 18:12:50 tgl Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -2311,6 +2311,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 			else
 				tblinfo[i].pkIndexOid = NULL;
 
+			PQclear(res2);
 		}
 		else
 			tblinfo[i].pkIndexOid = NULL;
@@ -2383,6 +2384,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 				perror("strdup");
 				exit(1);
 			}
+			PQclear(res2);
 		}
 		else
 			tblinfo[i].primary_key_name = NULL;
@@ -2533,6 +2535,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 				else
 					tgfunc = strdup(finfo[findx].proname);
 
+				resetPQExpBuffer(delqry);
 				appendPQExpBuffer(delqry, "DROP TRIGGER %s ", fmtId(tgname, force_quotes));
 				appendPQExpBuffer(delqry, "ON %s;\n",
 								fmtId(tblinfo[i].relname, force_quotes));

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.4 2001/08/03 20:14:06 tgl Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.205.2.5 2004/03/20 18:12:50 tgl Exp $`
`26`	`26`	`*`
`27`	`27`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`28`	`28`	`*`
`@@ -2311,6 +2311,7 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`2311`	`2311`	`else`
`2312`	`2312`	`tblinfo[i].pkIndexOid = NULL;`
`2313`	`2313`
	`2314`	`+ PQclear(res2);`
`2314`	`2315`	`}`
`2315`	`2316`	`else`
`2316`	`2317`	`tblinfo[i].pkIndexOid = NULL;`
`@@ -2383,6 +2384,7 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`2383`	`2384`	`perror("strdup");`
`2384`	`2385`	`exit(1);`
`2385`	`2386`	`}`
	`2387`	`+ PQclear(res2);`
`2386`	`2388`	`}`
`2387`	`2389`	`else`
`2388`	`2390`	`tblinfo[i].primary_key_name = NULL;`
`@@ -2533,6 +2535,7 @@ getTables(int numTables, FuncInfo finfo, int numFuncs)`
`2533`	`2535`	`else`
`2534`	`2536`	`tgfunc = strdup(finfo[findx].proname);`
`2535`	`2537`
	`2538`	`+ resetPQExpBuffer(delqry);`
`2536`	`2539`	`appendPQExpBuffer(delqry, "DROP TRIGGER %s ", fmtId(tgname, force_quotes));`
`2537`	`2540`	`appendPQExpBuffer(delqry, "ON %s;\n",`
`2538`	`2541`	`fmtId(tblinfo[i].relname, force_quotes));`