summaryrefslogtreecommitdiff
path: root/src/backend/postmaster
diff options
context:
space:
mode:
authorTom Lane2000-03-19 22:10:08 +0000
committerTom Lane2000-03-19 22:10:08 +0000
commit58422dd0af33fa01d276ea8ff3db82bac49e13db (patch)
treebd26c965988dff3f90065de50c5981ab13f1f716 /src/backend/postmaster
parent6a0274655036de20e967d68a19979e2ba399e61f (diff)
Several calls to StrNCpy incorrectly subtracted 1 from the length arg,
leading to postmaster accepting args 1 shorter than it had room for.
Diffstat (limited to 'src/backend/postmaster')
-rw-r--r--src/backend/postmaster/postmaster.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 28a7ae3933..7c44dbc7f9 100644
--- 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.137 2000/03/17 02:36:18 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.138 2000/03/19 22:10:08 tgl Exp $
*
* NOTES
*
@@ -1146,15 +1146,15 @@ readStartupPacket(void *arg, PacketLen len, void *pkt)
* silently added and a long packet is silently truncated.
*/
- StrNCpy(port->database, si->database, sizeof(port->database) - 1);
- StrNCpy(port->user, si->user, sizeof(port->user) - 1);
- StrNCpy(port->options, si->options, sizeof(port->options) - 1);
- StrNCpy(port->tty, si->tty, sizeof(port->tty) - 1);
+ StrNCpy(port->database, si->database, sizeof(port->database));
+ StrNCpy(port->user, si->user, sizeof(port->user));
+ StrNCpy(port->options, si->options, sizeof(port->options));
+ StrNCpy(port->tty, si->tty, sizeof(port->tty));
/* The database defaults to the user name. */
if (port->database[0] == '\0')
- StrNCpy(port->database, si->user, sizeof(port->database) - 1);
+ StrNCpy(port->database, si->user, sizeof(port->database));
/* Check a user name was given. */