Repair incorrectly-figured snprintf length restriction.

tglsfdc · tglsfdc · commit 1afe0b314679 · 1999-05-04T23:39:20.000Z
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: pqcomm.c,v 1.68 1999/04/25 03:19:21 tgl Exp $
+ *  $Id: pqcomm.c,v 1.69 1999/05/04 23:39:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -261,8 +261,10 @@ StreamServerPort(char *hostName, short portName, int *fdP)
 			   "\tIs another postmaster already running on that port?\n");
 		if (family == AF_UNIX)
 		{
-			snprintf(PQerrormsg + strlen(PQerrormsg), ERROR_MSG_LENGTH,
-					"\tIf not, remove socket node (%s) and retry.\n", sock_path);
+			snprintf(PQerrormsg + strlen(PQerrormsg),
+					 ERROR_MSG_LENGTH - strlen(PQerrormsg),
+					 "\tIf not, remove socket node (%s) and retry.\n",
+					 sock_path);
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* Copyright (c) 1994, Regents of the University of California`
`30`	`30`	`*`
`31`		`- * $Id: pqcomm.c,v 1.68 1999/04/25 03:19:21 tgl Exp $`
	`31`	`+ * $Id: pqcomm.c,v 1.69 1999/05/04 23:39:20 tgl Exp $`
`32`	`32`	`*`
`33`	`33`	`*-------------------------------------------------------------------------`
`34`	`34`	`*/`
`@@ -261,8 +261,10 @@ StreamServerPort(char hostName, short portName, int fdP)`
`261`	`261`	`"\tIs another postmaster already running on that port?\n");`
`262`	`262`	`if (family == AF_UNIX)`
`263`	`263`	`{`
`264`		`- snprintf(PQerrormsg + strlen(PQerrormsg), ERROR_MSG_LENGTH,`
`265`		`- "\tIf not, remove socket node (%s) and retry.\n", sock_path);`
	`264`	`+ snprintf(PQerrormsg + strlen(PQerrormsg),`
	`265`	`+ ERROR_MSG_LENGTH - strlen(PQerrormsg),`
	`266`	`+ "\tIf not, remove socket node (%s) and retry.\n",`
	`267`	`+ sock_path);`
`266`	`268`	`}`
`267`	`269`	`else`
`268`	`270`	`{`