mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-23 19:39:53 +08:00
Code Issues 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:50 +00:00
parent 8b33d83cc5
commit f82e8e7f6f
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
* $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:

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

@ -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);

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

@ -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;