NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit07be293

committed

Fix memory leakage introduced into print_aligned_text by 8.4 changes

(failure to free col_lineptrs[] array elements) and exacerbated in thecurrent devel cycle (failure to free "wrap"). This resulted in moderatebloat of psql over long script runs. Noted while testing bug #5302,although what the reporter was complaining of was backend-side leakage.

1 parent3e51ae4 commit07be293Copy full SHA for 07be293

File tree

1 file changed

-4

lines changed

src/bin/psql
- print.c

1 file changed

-4

lines changed

`‎src/bin/psql/print.c`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.120 2010/01/02 16:57:59 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.121 2010/01/30 18:59:51 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -1047,6 +1047,11 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`1047`	`1047`	`}`
`1048`	`1048`
`1049`	`1049`	`/* clean up */`
	`1050`	`+for (i=0;i<col_count;i++)`
	`1051`	`+{`
	`1052`	`+free(col_lineptrs[i]);`
	`1053`	`+free(format_buf[i]);`
	`1054`	`+}`
`1050`	`1055`	`free(width_header);`
`1051`	`1056`	`free(width_average);`
`1052`	`1057`	`free(max_width);`
`@@ -1055,11 +1060,10 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`1055`	`1060`	`free(curr_nl_line);`
`1056`	`1061`	`free(col_lineptrs);`
`1057`	`1062`	`free(max_bytes);`
	`1063`	`+free(format_buf);`
`1058`	`1064`	`free(header_done);`
`1059`	`1065`	`free(bytes_output);`
`1060`		`-for (i=0;i<col_count;i++)`
`1061`		`-free(format_buf[i]);`
`1062`		`-free(format_buf);`
	`1066`	`+free(wrap);`
`1063`	`1067`
`1064`	`1068`	`if (is_pager)`
`1065`	`1069`	`ClosePager(fout);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit07be293

File tree

1 file changed

1 file changed

`‎src/bin/psql/print.c`

0 commit comments