Fix off-by-one error in the maxlen parameter handling.

petere · petere · commit a14424a9d2fd · 2003-03-18T22:09:37.000Z
diff --git a/src/bin/pg_dump/sprompt.c b/src/bin/pg_dump/sprompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/sprompt.c,v 1.3 2002/09/11 17:32:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/sprompt.c,v 1.4 2003/03/18 22:09:37 petere Exp $
  */
 
 /*
@@ -45,7 +45,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 				t;
 #endif
 
-	destination = (char *) malloc(maxlen + 2);
+	destination = (char *) malloc(maxlen + 1);
 	if (!destination)
 		return NULL;
 
@@ -83,7 +83,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 		fflush(termout);
 	}
 
-	if (fgets(destination, maxlen, termin) == NULL)
+	if (fgets(destination, maxlen + 1, termin) == NULL)
 		destination[0] = '\0';
 
 	length = strlen(destination);
diff --git a/src/bin/psql/sprompt.c b/src/bin/psql/sprompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/sprompt.c,v 1.3 2002/09/04 20:31:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/sprompt.c,v 1.4 2003/03/18 22:09:37 petere Exp $
  */
 
 
@@ -44,7 +44,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 				t;
 #endif
 
-	destination = (char *) malloc(maxlen + 2);
+	destination = (char *) malloc(maxlen + 1);
 	if (!destination)
 		return NULL;
 
@@ -82,7 +82,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 		fflush(termout);
 	}
 
-	if (fgets(destination, maxlen, termin) == NULL)
+	if (fgets(destination, maxlen + 1, termin) == NULL)
 		destination[0] = '\0';
 
 	length = strlen(destination);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/sprompt.c,v 1.3 2002/09/04 20:31:36 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/sprompt.c,v 1.4 2003/03/18 22:09:37 petere Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`
`@@ -44,7 +44,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`44`	`44`	`t;`
`45`	`45`	`#endif`
`46`	`46`
`47`		`- destination = (char *) malloc(maxlen + 2);`
	`47`	`+ destination = (char *) malloc(maxlen + 1);`
`48`	`48`	`if (!destination)`
`49`	`49`	`return NULL;`
`50`	`50`
`@@ -82,7 +82,7 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`82`	`82`	`fflush(termout);`
`83`	`83`	`}`
`84`	`84`
`85`		`- if (fgets(destination, maxlen, termin) == NULL)`
	`85`	`+ if (fgets(destination, maxlen + 1, termin) == NULL)`
`86`	`86`	`destination[0] = '\0';`
`87`	`87`
`88`	`88`	`length = strlen(destination);`