Don't uselessly escape a string that doesn't need escaping

alvherre · ibarwick · alvherre · commit 0994cfc0ac85 · 2019-07-26T17:46:40.000-04:00
Per gripe from Ian Barwick Co-authored-by: Ian Barwick <ian@2ndquadrant.com> Discussion: https://postgr.es/m/CABvVfJWNnNKb8cHsTLhkTsvL1+G6BVcV+57+w1JZ61p8YGPdWQ@mail.gmail.com
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1716,9 +1716,9 @@ GenerateRecoveryConf(PGconn *conn)
 
 	if (replication_slot)
 	{
-		escaped = escape_quotes(replication_slot);
-		appendPQExpBuffer(recoveryconfcontents, "primary_slot_name = '%s'\n", replication_slot);
-		free(escaped);
+		/* unescaped: ReplicationSlotValidateName allows [a-z0-9_] only */
+		appendPQExpBuffer(recoveryconfcontents, "primary_slot_name = '%s'\n",
+						  replication_slot);
 	}
 
 	if (PQExpBufferBroken(recoveryconfcontents) ||

Original file line number	Diff line number	Diff line change
`@@ -1716,9 +1716,9 @@ GenerateRecoveryConf(PGconn *conn)`
`1716`	`1716`
`1717`	`1717`	`if (replication_slot)`
`1718`	`1718`	`{`
`1719`		`- escaped = escape_quotes(replication_slot);`
`1720`		`- appendPQExpBuffer(recoveryconfcontents, "primary_slot_name = '%s'\n", replication_slot);`
`1721`		`- free(escaped);`
	`1719`	`+ /* unescaped: ReplicationSlotValidateName allows [a-z0-9_] only */`
	`1720`	`+ appendPQExpBuffer(recoveryconfcontents, "primary_slot_name = '%s'\n",`
	`1721`	`+ replication_slot);`
`1722`	`1722`	`}`
`1723`	`1723`
`1724`	`1724`	`if (PQExpBufferBroken(recoveryconfcontents) \|\|`