Fix erroneous error message printout when a configuration file contains

tglsfdc · tglsfdc · commit 957b90ed6aaa · 2004-05-25T19:11:14.000Z
an overlength token.  Printout was always garbage and could dump core
entirely :-(.  Per report from Martin Pitt.
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.121 2004/05/19 22:06:16 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.122 2004/05/25 19:11:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -144,14 +144,14 @@ next_token(FILE *fp, char *buf, int bufsz)
 
 		if (buf >= end_buf)
 		{
+			*buf = '\0';
 			ereport(LOG,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
 					 errmsg("authentication file token too long, skipping: \"%s\"",
-							buf)));
+							start_buf)));
 			/* Discard remainder of line */
 			while ((c = getc(fp)) != EOF && c != '\n')
 				;
-			buf[0] = '\0';
 			break;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.121 2004/05/19 22:06:16 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.122 2004/05/25 19:11:14 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -144,14 +144,14 @@ next_token(FILE fp, char buf, int bufsz)`
`144`	`144`
`145`	`145`	`if (buf >= end_buf)`
`146`	`146`	`{`
	`147`	`+ *buf = '\0';`
`147`	`148`	`ereport(LOG,`
`148`	`149`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`149`	`150`	`errmsg("authentication file token too long, skipping: \"%s\"",`
`150`		`- buf)));`
	`151`	`+ start_buf)));`
`151`	`152`	`/* Discard remainder of line */`
`152`	`153`	`while ((c = getc(fp)) != EOF && c != '\n')`
`153`	`154`	`;`
`154`		`- buf[0] = '\0';`
`155`	`155`	`break;`
`156`	`156`	`}`
`157`	`157`