Cleanup minor pg_dump memory leaks

sfrost · sfrost · commit 369d494a4f5c · 2018-12-06T11:11:21.000-05:00
In dumputils, we may have successfully parsed the acls when we discover that we can't parse the reverse ACLs and then return- check and free aclitems if that happens. In dumpTableSchema, move ftoptions and srvname under the relkind != RELKIND_VIEW branch (since they're only used there) and then check if they've been allocated and, if so, free them at the end of that block. Pointed out by Pavel Raiskup, though I didn't use those patches. Discussion: https://postgr.es/m/2183976.vkCJMhdhmF@nb.usersys.redhat.com
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
@@ -95,6 +95,8 @@ buildACLCommands(const char *name, const char *subname, const char *nspname,
 	{
 		if (!parsePGArray(racls, &raclitems, &nraclitems))
 		{
+			if (aclitems)
+				free(aclitems);
 			if (raclitems)
 				free(raclitems);
 			return false;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -15303,8 +15303,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 	int			actual_atts;	/* number of attrs in this CREATE statement */
 	const char *reltypename;
 	char	   *storage;
-	char	   *srvname;
-	char	   *ftoptions;
 	int			j,
 				k;
 
@@ -15361,6 +15359,9 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 	}
 	else
 	{
+		char	   *ftoptions = NULL;
+		char	   *srvname = NULL;
+
 		switch (tbinfo->relkind)
 		{
 			case RELKIND_FOREIGN_TABLE:
@@ -15397,13 +15398,9 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				}
 			case RELKIND_MATVIEW:
 				reltypename = "MATERIALIZED VIEW";
-				srvname = NULL;
-				ftoptions = NULL;
 				break;
 			default:
 				reltypename = "TABLE";
-				srvname = NULL;
-				ftoptions = NULL;
 		}
 
 		numParents = tbinfo->numParents;
@@ -15951,6 +15948,11 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 								  tbinfo->attfdwoptions[j]);
 			}
 		}
+
+		if (ftoptions)
+			free(ftoptions);
+		if (srvname)
+			free(srvname);
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ buildACLCommands(const char name, const char subname, const char *nspname,`
`95`	`95`	`{`
`96`	`96`	`if (!parsePGArray(racls, &raclitems, &nraclitems))`
`97`	`97`	`{`
	`98`	`+ if (aclitems)`
	`99`	`+ free(aclitems);`
`98`	`100`	`if (raclitems)`
`99`	`101`	`free(raclitems);`
`100`	`102`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -15303,8 +15303,6 @@ dumpTableSchema(Archive fout, TableInfo tbinfo)`
`15303`	`15303`	`int actual_atts; /* number of attrs in this CREATE statement */`
`15304`	`15304`	`const char *reltypename;`
`15305`	`15305`	`char *storage;`
`15306`		`- char *srvname;`
`15307`		`- char *ftoptions;`
`15308`	`15306`	`int j,`
`15309`	`15307`	`k;`
`15310`	`15308`
`@@ -15361,6 +15359,9 @@ dumpTableSchema(Archive fout, TableInfo tbinfo)`
`15361`	`15359`	`}`
`15362`	`15360`	`else`
`15363`	`15361`	`{`
	`15362`	`+ char *ftoptions = NULL;`
	`15363`	`+ char *srvname = NULL;`
	`15364`	`+`
`15364`	`15365`	`switch (tbinfo->relkind)`
`15365`	`15366`	`{`
`15366`	`15367`	`case RELKIND_FOREIGN_TABLE:`
`@@ -15397,13 +15398,9 @@ dumpTableSchema(Archive fout, TableInfo tbinfo)`
`15397`	`15398`	`}`
`15398`	`15399`	`case RELKIND_MATVIEW:`
`15399`	`15400`	`reltypename = "MATERIALIZED VIEW";`
`15400`		`- srvname = NULL;`
`15401`		`- ftoptions = NULL;`
`15402`	`15401`	`break;`
`15403`	`15402`	`default:`
`15404`	`15403`	`reltypename = "TABLE";`
`15405`		`- srvname = NULL;`
`15406`		`- ftoptions = NULL;`
`15407`	`15404`	`}`
`15408`	`15405`
`15409`	`15406`	`numParents = tbinfo->numParents;`
`@@ -15951,6 +15948,11 @@ dumpTableSchema(Archive fout, TableInfo tbinfo)`
`15951`	`15948`	`tbinfo->attfdwoptions[j]);`
`15952`	`15949`	`}`
`15953`	`15950`	`}`
	`15951`	`+`
	`15952`	`+ if (ftoptions)`
	`15953`	`+ free(ftoptions);`
	`15954`	`+ if (srvname)`
	`15955`	`+ free(srvname);`
`15954`	`15956`	`}`
`15955`	`15957`
`15956`	`15958`	`/*`