postgres.git / summary / log / commit / refs

commit    9a6313f469594feb01fa2e213d3a2d2daf0029cd
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Sep 02 02:40:59 2009 +0000
First released in: 9.0.0, 8.0.22, 8.1.18, 8.2.14, 8.3.8, 8.4.1

    Fix pg_ctl's readfile() to not go into infinite loop on an empty file
    (could happen if either postgresql.conf or postmaster.opts is empty).
    It's been broken since the C version was written for 8.0, so patch
    all the way back.
    
    initdb's copy of the function is broken in the same way, but it's
    less important there since the input files should never be empty.
    Patch that in HEAD only, and also fix some cosmetic differences that
    crept into that copy of the function.
    
    Per report from Corry Haines and Jeff Davis.


 src/bin/pg_ctl/pg_ctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 40ede2c1a83..7a7d03e8f69 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.111 2009/06/11 14:49:07 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.111.2.1 2009/09/02 02:40:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -292,7 +292,7 @@ static char **
 readfile(const char *path)
 {
 	FILE	   *infile;
-	int			maxlength = 0,
+	int			maxlength = 1,
 				linelen = 0;
 	int			nlines = 0;
 	char	  **result;


[parent: ba5317237fe5]