From 61d75116a72329ba50cb9e89379eaf5ceab02419 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Wed, 3 Mar 2010 20:31:09 +0000
Subject: 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.)

---
 src/interfaces/libpq/fe-connect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/interfaces')

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9302e28782..1dc52ef148 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.388 2010/02/26 02:01:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.389 2010/03/03 20:31:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4394,7 +4394,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;
-- 
cgit v1.2.3