NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit94077df

committed

Avoid casting away const in sepgsql's quote_object_name.

quote_identifier's API is designed on the assumption that it'snot worth worrying about a short-term memory leak when we haveto produce a quoted version of the given identifier. Whoever wrotequote_object_name took it on themselves to override that judgment,but the only way to do so is to cast away const someplace. We canavoid that and substantially shorten the function by going alongwith quote_identifier's opinion. AFAICS quote_object_name is notused in any way where this would be unsustainable.Per discussion of commit45987aa, which exposed that we hada casting-away-const situation here.Discussion:https://postgr.es/m/20220827112304.GL2342@telsasoft.com

1 parentd1ce745 commit94077dfCopy full SHA for 94077df

File tree

1 file changed

-27

lines changed

contrib/sepgsql
- label.c

1 file changed

-27

lines changed

`‎contrib/sepgsql/label.c`

Lines changed: 6 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -646,45 +646,24 @@ sepgsql_mcstrans_out(PG_FUNCTION_ARGS)`
`646`	`646`	`/*`
`647`	`647`	`* quote_object_name`
`648`	`648`	`*`
`649`		`- * It tries to quote the supplied identifiers`
	`649`	`+ * Concatenate as many of the given strings as aren't NULL, with dots between.`
	`650`	`+ * Quote any of the strings that wouldn't be valid identifiers otherwise.`
`650`	`651`	`*/`
`651`	`652`	`staticchar*`
`652`	`653`	`quote_object_name(constcharsrc1,constcharsrc2,`
`653`	`654`	`constcharsrc3,constcharsrc4)`
`654`	`655`	`{`
`655`	`656`	`StringInfoDataresult;`
`656`		`-constchar*temp;`
`657`	`657`
`658`	`658`	`initStringInfo(&result);`
`659`		`-`
`660`	`659`	`if (src1)`
`661`		`-{`
`662`		`-temp=quote_identifier(src1);`
`663`		`-appendStringInfoString(&result,temp);`
`664`		`-if (src1!=temp)`
`665`		`-pfree(temp);`
`666`		`-}`
	`660`	`+appendStringInfoString(&result,quote_identifier(src1));`
`667`	`661`	`if (src2)`
`668`		`-{`
`669`		`-temp=quote_identifier(src2);`
`670`		`-appendStringInfo(&result,".%s",temp);`
`671`		`-if (src2!=temp)`
`672`		`-pfree(temp);`
`673`		`-}`
	`662`	`+appendStringInfo(&result,".%s",quote_identifier(src2));`
`674`	`663`	`if (src3)`
`675`		`-{`
`676`		`-temp=quote_identifier(src3);`
`677`		`-appendStringInfo(&result,".%s",temp);`
`678`		`-if (src3!=temp)`
`679`		`-pfree(temp);`
`680`		`-}`
	`664`	`+appendStringInfo(&result,".%s",quote_identifier(src3));`
`681`	`665`	`if (src4)`
`682`		`-{`
`683`		`-temp=quote_identifier(src4);`
`684`		`-appendStringInfo(&result,".%s",temp);`
`685`		`-if (src4!=temp)`
`686`		`-pfree(temp);`
`687`		`-}`
	`666`	`+appendStringInfo(&result,".%s",quote_identifier(src4));`
`688`	`667`	`returnresult.data;`
`689`	`668`	`}`
`690`	`669`

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!

Commit94077df

File tree

1 file changed

1 file changed

`‎contrib/sepgsql/label.c`

0 commit comments