NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd613861

committed

pg_dump: fix subtle memory leak in func and arg signature processing

1 parent3f05bed commitd613861Copy full SHA for d613861

File tree

1 file changed

-10

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-10

lines changed

`‎src/bin/pg_dump/pg_dump.c‎`

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -9604,7 +9604,7 @@ dumpFunc(Archive fout, FuncInfo finfo)`
`9604`	`9604`	`PQExpBufferasPart;`
`9605`	`9605`	`PGresult*res;`
`9606`	`9606`	`charfuncsig;/ identity signature */`
`9607`		`-charfuncfullsig;/ full signature */`
	`9607`	`+charfuncfullsig=NULL;/ full signature */`
`9608`	`9608`	`char*funcsig_tag;`
`9609`	`9609`	`char*proretset;`
`9610`	`9610`	`char*prosrc;`
`@@ -9912,13 +9912,10 @@ dumpFunc(Archive fout, FuncInfo finfo)`
`9912`	`9912`	`funcsig=format_function_arguments(finfo,funciargs, false);`
`9913`	`9913`	`}`
`9914`	`9914`	`else`
`9915`		`-{`
`9916`	`9915`	`/* pre-8.4, do it ourselves */`
`9917`	`9916`	`funcsig=format_function_arguments_old(fout,`
`9918`	`9917`	`finfo,nallargs,allargtypes,`
`9919`	`9918`	`argmodes,argnames);`
`9920`		`-funcfullsig=funcsig;`
`9921`		`-}`
`9922`	`9919`
`9923`	`9920`	`funcsig_tag=format_function_signature(fout,finfo, false);`
`9924`	`9921`
`@@ -9929,7 +9926,8 @@ dumpFunc(Archive fout, FuncInfo finfo)`
`9929`	`9926`	`fmtId(finfo->dobj.namespace->dobj.name),`
`9930`	`9927`	`funcsig);`
`9931`	`9928`
`9932`		`-appendPQExpBuffer(q,"CREATE FUNCTION %s ",funcfullsig);`
	`9929`	`+appendPQExpBuffer(q,"CREATE FUNCTION %s ",funcfullsig ?funcfullsig :`
	`9930`	`+funcsig);`
`9933`	`9931`	`if (funcresult)`
`9934`	`9932`	`appendPQExpBuffer(q,"RETURNS %s",funcresult);`
`9935`	`9933`	`else`
`@@ -10052,6 +10050,8 @@ dumpFunc(Archive fout, FuncInfo finfo)`
`10052`	`10050`	`destroyPQExpBuffer(labelq);`
`10053`	`10051`	`destroyPQExpBuffer(asPart);`
`10054`	`10052`	`free(funcsig);`
	`10053`	`+if (funcfullsig)`
	`10054`	`+free(funcfullsig);`
`10055`	`10055`	`free(funcsig_tag);`
`10056`	`10056`	`if (allargtypes)`
`10057`	`10057`	`free(allargtypes);`
`@@ -11508,7 +11508,7 @@ dumpAgg(Archive fout, AggInfo agginfo)`
`11508`	`11508`	`PQExpBufferlabelq;`
`11509`	`11509`	`PQExpBufferdetails;`
`11510`	`11510`	`charaggsig;/ identity signature */`
`11511`		`-charaggfullsig;/ full signature */`
	`11511`	`+charaggfullsig=NULL;/ full signature */`
`11512`	`11512`	`char*aggsig_tag;`
`11513`	`11513`	`PGresult*res;`
`11514`	`11514`	`inti_aggtransfn;`
`@@ -11656,11 +11656,8 @@ dumpAgg(Archive fout, AggInfo agginfo)`
`11656`	`11656`	`aggsig=format_function_arguments(&agginfo->aggfn,funciargs, true);`
`11657`	`11657`	`}`
`11658`	`11658`	`else`
`11659`		`-{`
`11660`	`11659`	`/* pre-8.4, do it ourselves */`
`11661`	`11660`	`aggsig=format_aggregate_signature(agginfo,fout, true);`
`11662`		`-aggfullsig=aggsig;`
`11663`		`-}`
`11664`	`11661`
`11665`	`11662`	`aggsig_tag=format_aggregate_signature(agginfo,fout, false);`
`11666`	`11663`
`@@ -11730,7 +11727,7 @@ dumpAgg(Archive fout, AggInfo agginfo)`
`11730`	`11727`	`aggsig);`
`11731`	`11728`
`11732`	`11729`	`appendPQExpBuffer(q,"CREATE AGGREGATE %s (\n%s\n);\n",`
`11733`		`-aggfullsig,details->data);`
	`11730`	`+aggfullsig ?aggfullsig :aggsig,details->data);`
`11734`	`11731`
`11735`	`11732`	`appendPQExpBuffer(labelq,"AGGREGATE %s",aggsig);`
`11736`	`11733`
`@@ -11773,6 +11770,8 @@ dumpAgg(Archive fout, AggInfo agginfo)`
`11773`	`11770`	`agginfo->aggfn.rolname,agginfo->aggfn.proacl);`
`11774`	`11771`
`11775`	`11772`	`free(aggsig);`
	`11773`	`+if (aggfullsig)`
	`11774`	`+free(aggfullsig);`
`11776`	`11775`	`free(aggsig_tag);`
`11777`	`11776`
`11778`	`11777`	`PQclear(res);`

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!

Commitd613861

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dump.c‎`

0 commit comments