diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-03 20:31:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-03 20:31:09 +0000 |
| commit | 61d75116a72329ba50cb9e89379eaf5ceab02419 (patch) | |
| tree | c417197055f56e5c4b182612042e83b4a7497605 | |
| parent | eb1c3b5e3b076f919f4c7f4864492f8c323088d2 (diff) | |
| download | postgresql-61d75116a72329ba50cb9e89379eaf5ceab02419.tar.gz postgresql-61d75116a72329ba50cb9e89379eaf5ceab02419.zip | |
Fix a couple of places that would loop forever if attempts to read a stdio file
set ferror() but never set feof(). This is known to be the case for recent
glibc when trying to read a directory as a file, and might be true for other
platforms/cases too. Per report from Ed L. (There is more that we ought to
do about his report, but this is one easily identifiable issue.)
| -rw-r--r-- | src/backend/libpq/hba.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 79dc90b337b..afc39f45bfe 100644 --- 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.199 2010/03/01 16:02:01 mha Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.200 2010/03/03 20:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -404,7 +404,7 @@ tokenize_file(const char *filename, FILE *file, *lines = *line_nums = NIL; - while (!feof(file)) + while (!feof(file) && !ferror(file)) { buf = next_token_expand(filename, file); diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 9302e287822..1dc52ef1485 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.388 2010/02/26 02:01:32 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.389 2010/03/03 20:31:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -4394,7 +4394,7 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username) if (fp == NULL) return NULL; - while (!feof(fp)) + while (!feof(fp) && !ferror(fp)) { char *t = buf, *ret; |