diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-08 18:41:55 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-08 18:41:55 +0000 |
commit | 18e64f6c818de668276079de6741f1bcab9c47cf (patch) | |
tree | 101ce4eb2db14637e044b8458e82a254bb56c858 /src | |
parent | a646e4874a1e792a3261a8087833e04b9715ac1d (diff) | |
download | postgresql-18e64f6c818de668276079de6741f1bcab9c47cf.tar.gz postgresql-18e64f6c818de668276079de6741f1bcab9c47cf.zip |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/utils/misc/guc-file.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 60a42232a67..8ace835b8b8 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.29 2005/01/01 05:43:08 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.29.4.1 2005/07/08 18:41:55 tgl Exp $ */ %{ @@ -69,7 +69,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; |