diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-03 20:31:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-03-03 20:31:50 +0000 |
| commit | f82e8e7f6ff066ca019ed9a2cab1d78bd43738c6 (patch) | |
| tree | edaae7151ea028dcac4c99d9e8287bb1ea06007f | |
| parent | 8b33d83cc59d38a83f7cd4abe7738835e24f8624 (diff) | |
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/commands/copy.c | 4 | ||||
| -rw-r--r-- | src/backend/libpq/hba.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index ba371f728d9..497a67ab815 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.213.2.3 2006/05/21 20:06:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.213.2.4 2010/03/03 20:31:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -381,7 +381,7 @@ CopyGetData(void *databuf, int datasize) { case COPY_FILE: fread(databuf, datasize, 1, copy_file); - if (feof(copy_file)) + if (feof(copy_file) || ferror(copy_file)) fe_eof = true; break; case COPY_OLD_FE: diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 12c94a3db41..89368aea218 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.116.2.4 2004/11/17 19:54:34 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.116.2.5 2010/03/03 20:31:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -317,7 +317,7 @@ tokenize_file(FILE *file) int line_number = 1; char *buf; - while (!feof(file)) + while (!feof(file) && !ferror(file)) { buf = next_token_expand(file); diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 0ff901639ac..5ff0fc68c24 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.263.2.6 2007/07/23 18:10:13 mha Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.263.2.7 2010/03/03 20:31:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3159,7 +3159,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; |