NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8427ce4

committed

Fix handling of escape sequences in postgres_fdw.application_name

postgres_fdw.application_name relies on MyProcPort to define the datathat should be added to escape sequences %u (user name) or %d (databasename). However this code could be run in processes that lack aMyProcPort, like an autovacuum process, causing crashes.The code generating the application name is made more flexible with thiscommit, so as it now generates no data for %u and %d if MyProcPort ismissing, and a simple "unknown" if MyProcPort exists, but the expectedfields are not set.Reported-by: Alexander LakhinAuthor: Kyotaro Horiguchi, Michael PaquierReviewed-by: Hayato Kuroda, Masahiko SawadaDiscussion:https://postgr.es/m/17789-8b31c5a4672b74d9@postgresql.orgBackpatch-through: 15

1 parent038f586 commit8427ce4Copy full SHA for 8427ce4

File tree

1 file changed

+18

-4

lines changed

contrib/postgres_fdw
- option.c

1 file changed

+18

-4

lines changed

`‎contrib/postgres_fdw/option.c`

Lines changed: 18 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,6 @@ process_pgfdw_appname(const char *appname)`
`485`	`485`	`constchar*p;`
`486`	`486`	`StringInfoDatabuf;`
`487`	`487`
`488`		`-Assert(MyProcPort!=NULL);`
`489`		`-`
`490`	`488`	`initStringInfo(&buf);`
`491`	`489`
`492`	`490`	`for (p=appname;*p!='\0';p++)`
`@@ -522,13 +520,29 @@ process_pgfdw_appname(const char *appname)`
`522`	`520`	`appendStringInfoString(&buf,cluster_name);`
`523`	`521`	`break;`
`524`	`522`	`case'd':`
`525`		`-appendStringInfoString(&buf,MyProcPort->database_name);`
	`523`	`+if (MyProcPort)`
	`524`	`+{`
	`525`	`+constchar*dbname=MyProcPort->database_name;`
	`526`	`+`
	`527`	`+if (dbname)`
	`528`	`+appendStringInfoString(&buf,dbname);`
	`529`	`+else`
	`530`	`+appendStringInfoString(&buf,"[unknown]");`
	`531`	`+}`
`526`	`532`	`break;`
`527`	`533`	`case'p':`
`528`	`534`	`appendStringInfo(&buf,"%d",MyProcPid);`
`529`	`535`	`break;`
`530`	`536`	`case'u':`
`531`		`-appendStringInfoString(&buf,MyProcPort->user_name);`
	`537`	`+if (MyProcPort)`
	`538`	`+{`
	`539`	`+constchar*username=MyProcPort->user_name;`
	`540`	`+`
	`541`	`+if (username)`
	`542`	`+appendStringInfoString(&buf,username);`
	`543`	`+else`
	`544`	`+appendStringInfoString(&buf,"[unknown]");`
	`545`	`+}`
`532`	`546`	`break;`
`533`	`547`	`default:`
`534`	`548`	`/* format error - ignore it */`

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!

Commit8427ce4

File tree

1 file changed

1 file changed

`‎contrib/postgres_fdw/option.c`

0 commit comments