mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:16 +00:00
parent cad1ddf17c
commit fe9a5f2f66
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
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.188.2.1 2009/10/03 20:04:45 tgl Exp $
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.188.2.2 2010/03/03 20:31:16 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);

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

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.375 2009/06/11 14:49:13 momjian Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.375.2.1 2010/03/03 20:31:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -3891,7 +3891,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;