NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commita9d58bf

committed

Fix tiny memory leaks

Both check_application_name() and check_cluster_name() usepg_clean_ascii() but didn't release the memory. Depending on when theGUC is set, this might be cleaned up at some later time or it wouldleak postmaster memory once. In any case, it seems better not to haveto rely on such analysis and make the code locally robust. Also, thismakes Valgrind happier.Author: Masahiko Sawada <sawada.mshk@gmail.com>Reviewed-by: Jacob Champion <jchampion@timescale.com>Discussion:https://www.postgresql.org/message-id/CAD21AoBmFNy9MPfA0UUbMubQqH3AaK5U3mrv6pSeWrwCk3LJ8g@mail.gmail.com

1 parent83e42a0 commita9d58bfCopy full SHA for a9d58bf

File tree

1 file changed

+16

-6

lines changed

src/backend/commands
- variable.c

1 file changed

+16

-6

lines changed

`‎src/backend/commands/variable.c`

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1025,17 +1025,22 @@ bool`
`1025`	`1025`	`check_application_name(charnewval,voidextra,GucSourcesource)`
`1026`	`1026`	`{`
`1027`	`1027`	`char*clean;`
	`1028`	`+char*ret;`
`1028`	`1029`
`1029`	`1030`	`/* Only allow clean ASCII chars in the application name */`
`1030`	`1031`	`clean=pg_clean_ascii(*newval,MCXT_ALLOC_NO_OOM);`
`1031`	`1032`	`if (!clean)`
`1032`	`1033`	`return false;`
`1033`	`1034`
`1034`		`-clean=guc_strdup(WARNING,clean);`
`1035`		`-if (!clean)`
	`1035`	`+ret=guc_strdup(WARNING,clean);`
	`1036`	`+if (!ret)`
	`1037`	`+{`
	`1038`	`+pfree(clean);`
`1036`	`1039`	`return false;`
	`1040`	`+}`
`1037`	`1041`
`1038`		`-*newval=clean;`
	`1042`	`+pfree(clean);`
	`1043`	`+*newval=ret;`
`1039`	`1044`	`return true;`
`1040`	`1045`	`}`
`1041`	`1046`
`@@ -1056,17 +1061,22 @@ bool`
`1056`	`1061`	`check_cluster_name(charnewval,voidextra,GucSourcesource)`
`1057`	`1062`	`{`
`1058`	`1063`	`char*clean;`
	`1064`	`+char*ret;`
`1059`	`1065`
`1060`	`1066`	`/* Only allow clean ASCII chars in the cluster name */`
`1061`	`1067`	`clean=pg_clean_ascii(*newval,MCXT_ALLOC_NO_OOM);`
`1062`	`1068`	`if (!clean)`
`1063`	`1069`	`return false;`
`1064`	`1070`
`1065`		`-clean=guc_strdup(WARNING,clean);`
`1066`		`-if (!clean)`
	`1071`	`+ret=guc_strdup(WARNING,clean);`
	`1072`	`+if (!ret)`
	`1073`	`+{`
	`1074`	`+pfree(clean);`
`1067`	`1075`	`return false;`
	`1076`	`+}`
`1068`	`1077`
`1069`		`-*newval=clean;`
	`1078`	`+pfree(clean);`
	`1079`	`+*newval=ret;`
`1070`	`1080`	`return true;`
`1071`	`1081`	`}`
`1072`	`1082`

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!

Commita9d58bf

File tree

1 file changed

1 file changed

`‎src/backend/commands/variable.c`

0 commit comments