Truncate incoming username and database name to NAMEDATALEN-1 characters

tglsfdc · tglsfdc · commit d18c1d1f5102 · 2001-02-20T01:34:40.000Z
so that we don't reject overlength names unnecessarily.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.207 2001/02/11 23:12:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.208 2001/02/20 01:34:40 tgl Exp $
  *
  * NOTES
  *
@@ -1123,6 +1123,14 @@ readStartupPacket(void *arg, PacketLen len, void *pkt)
 	if (port->database[0] == '\0')
 		StrNCpy(port->database, si->user, sizeof(port->database));
 
+	/* Truncate given database and user names to length of a Postgres name. */
+	/* This avoids lookup failures when overlength names are given. */
+
+	if ((int) sizeof(port->database) >= NAMEDATALEN)
+		port->database[NAMEDATALEN-1] = '\0';
+	if ((int) sizeof(port->user) >= NAMEDATALEN)
+		port->user[NAMEDATALEN-1] = '\0';
+
 	/* Check a user name was given. */
 
 	if (port->user[0] == '\0')

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.207 2001/02/11 23:12:28 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.208 2001/02/20 01:34:40 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -1123,6 +1123,14 @@ readStartupPacket(void arg, PacketLen len, void pkt)`
`1123`	`1123`	`if (port->database[0] == '\0')`
`1124`	`1124`	`StrNCpy(port->database, si->user, sizeof(port->database));`
`1125`	`1125`
	`1126`	`+ /* Truncate given database and user names to length of a Postgres name. */`
	`1127`	`+ /* This avoids lookup failures when overlength names are given. */`
	`1128`	`+`
	`1129`	`+ if ((int) sizeof(port->database) >= NAMEDATALEN)`
	`1130`	`+ port->database[NAMEDATALEN-1] = '\0';`
	`1131`	`+ if ((int) sizeof(port->user) >= NAMEDATALEN)`
	`1132`	`+ port->user[NAMEDATALEN-1] = '\0';`
	`1133`	`+`
`1126`	`1134`	`/* Check a user name was given. */`
`1127`	`1135`
`1128`	`1136`	`if (port->user[0] == '\0')`