psql: Fix memory leak

petere · petere · commit 1673122127f9 · 2012-03-07T23:52:15.000+02:00
In expanded auto mode, a lot of allocated memory was not cleaned up.

found by Coverity
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -735,7 +735,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
 		(output_columns < total_header_width || output_columns < width_total))
 	{
 		print_aligned_vertical(cont, fout);
-		return;
+		goto cleanup;
 	}
 
 	/* If we wrapped beyond the display width, use the pager */
@@ -1050,6 +1050,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
 		fputc('\n', fout);
 	}
 
+cleanup:
 	/* clean up */
 	for (i = 0; i < col_count; i++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`735`	`735`	`(output_columns < total_header_width \|\| output_columns < width_total))`
`736`	`736`	`{`
`737`	`737`	`print_aligned_vertical(cont, fout);`
`738`		`- return;`
	`738`	`+ goto cleanup;`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`/* If we wrapped beyond the display width, use the pager */`
`@@ -1050,6 +1050,7 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`1050`	`1050`	`fputc('\n', fout);`
`1051`	`1051`	`}`
`1052`	`1052`
	`1053`	`+cleanup:`
`1053`	`1054`	`/* clean up */`
`1054`	`1055`	`for (i = 0; i < col_count; i++)`
`1055`	`1056`	`{`