postgres.git / summary / log / commit / refs

commit    40d091b818722cbde7ed907893e110b2a820ad58
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri Jul 08 18:41:40 2005 +0000
First released in: 8.1.0, 8.0.4

    Fix config file lexer to not barf if postgresql.conf ends with a comment
    that has no terminating newline.  Per report from maps.on at gmx.net.


 src/backend/utils/misc/guc-file.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index c65acaff9f1..32d47c44cda 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.30 2005/03/11 19:13:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.31 2005/07/08 18:41:40 tgl Exp $
  */
 
 %{
@@ -70,7 +70,7 @@ STRING          \'([^'\n]|\\.)*\'
 
 \n              ConfigFileLineno++; return GUC_EOL;
 [ \t\r]+        /* eat whitespace */
-#.*$            /* eat comment */
+#.*             /* eat comment (.* matches anything until newline) */
 
 {ID}            return GUC_ID;
 {QUALIFIED_ID}  return GUC_QUALIFIED_ID;


[parent: 0ed5f90d736c]