mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.)
This commit is contained in:
Tom Lane 2010-03-03 20:31:41 +00:00
parent a15fa97a18
commit 1b8fe53c79
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/copy.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.236.4.3 2006/05/21 20:06:16 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.236.4.4 2010/03/03 20:31:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -393,7 +393,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:

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

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.136.4.1 2005/06/21 01:23:25 neilc Exp $
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.136.4.2 2010/03/03 20:31:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -400,7 +400,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.301.4.6 2007/07/23 18:12:56 mha Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.301.4.7 2010/03/03 20:31:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -3276,7 +3276,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;