database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Fix a couple of places that would loop forever if attempts to read a stdio file

Browse Source 
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.)
This commit is contained in:
Tom Lane 2010-03-03 20:31:29 +00:00
parent c4810d9ae0
commit 48fcbb803b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/libpq/hba.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.157 2006/11/05 22:42:08 tgl Exp $ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.157.2.1 2010/03/03 20:31:29 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -412,7 +412,7 @@ tokenize_file(const char *filename, FILE *file,
*lines = *line_nums = NIL; *lines = *line_nums = NIL;
while (!feof(file)) while (!feof(file) && !ferror(file))
{ {
buf = next_token_expand(filename, file); buf = next_token_expand(filename, file);

4
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.339.2.3 2007/10/09 15:03:31 mha Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.339.2.4 2010/03/03 20:31:29 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3637,7 +3637,7 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
if (fp == NULL) if (fp == NULL)
return NULL; return NULL;
while (!feof(fp)) while (!feof(fp) && !ferror(fp))
{ {
char *t = buf, char *t = buf,
*ret; *ret;