Commit58422dd

committed

Several calls to StrNCpy incorrectly subtracted 1 from the length arg,

leading to postmaster accepting args 1 shorter than it had room for.

1 parent6a02746 commit58422ddCopy full SHA for 58422dd

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.24 2000/01/26 05:56:29 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.25 2000/03/19 22:10:07 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -197,7 +197,7 @@ PacketSendError(Packet pkt, char errormsg)`
`197`	`197`	`fprintf(stderr,"%s\n",errormsg);`
`198`	`198`
`199`	`199`	`pkt->pkt.em.data[0]='E';`
`200`		`-StrNCpy(&pkt->pkt.em.data[1],errormsg,sizeof(pkt->pkt.em.data)-2);`
	`200`	`+StrNCpy(&pkt->pkt.em.data[1],errormsg,sizeof(pkt->pkt.em.data)-1);`
`201`	`201`
`202`	`202`	`/*`
`203`	`203`	`* The NULL i/o callback will cause the connection to be broken when`

Lines changed: 6 additions & 6 deletions

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.137 2000/03/17 02:36:18 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.138 2000/03/19 22:10:08 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -1146,15 +1146,15 @@ readStartupPacket(void arg, PacketLen len, void pkt)`
`1146`	`1146`	`* silently added and a long packet is silently truncated.`
`1147`	`1147`	`*/`
`1148`	`1148`
`1149`		`-StrNCpy(port->database,si->database,sizeof(port->database)-1);`
`1150`		`-StrNCpy(port->user,si->user,sizeof(port->user)-1);`
`1151`		`-StrNCpy(port->options,si->options,sizeof(port->options)-1);`
`1152`		`-StrNCpy(port->tty,si->tty,sizeof(port->tty)-1);`
	`1149`	`+StrNCpy(port->database,si->database,sizeof(port->database));`
	`1150`	`+StrNCpy(port->user,si->user,sizeof(port->user));`
	`1151`	`+StrNCpy(port->options,si->options,sizeof(port->options));`
	`1152`	`+StrNCpy(port->tty,si->tty,sizeof(port->tty));`
`1153`	`1153`
`1154`	`1154`	`/* The database defaults to the user name. */`
`1155`	`1155`
`1156`	`1156`	`if (port->database[0]=='\0')`
`1157`		`-StrNCpy(port->database,si->user,sizeof(port->database)-1);`
	`1157`	`+StrNCpy(port->database,si->user,sizeof(port->database));`
`1158`	`1158`
`1159`	`1159`	`/* Check a user name was given. */`
`1160`	`1160`

Comments

(0)