postgres.git / summary / log / commit / refs

commit    72e2db86b9845f75ebf538dd96614b1dab6cfb04
Author:   Magnus Hagander <magnus@hagander.net>
Date:     Tue May 13 20:53:52 2008 +0000
First released in: 8.4.0, 7.4.20, 8.0.16, 8.1.12, 8.2.8, 8.3.2

    Don't try to close negative file descriptors, since this can cause
    crashes on certain platforms. In particular, the MSVC runtime is known
    to do this.
    
    Fixes bug #4162, reported and diagnosed by Javier Pimas


 src/backend/access/transam/xlog.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 3504c738669..28e50768523 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.307 2008/05/12 19:45:23 mha Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.308 2008/05/13 20:53:52 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3334,8 +3334,11 @@ got_record:;
 	return (XLogRecord *) buffer;
 
 next_record_is_invalid:;
-	close(readFile);
-	readFile = -1;
+	if (readFile >= 0)
+	{
+		close(readFile);
+		readFile = -1;
+	}
 	nextRecord = NULL;
 	return NULL;
 }


[parent: d82a1d582cf1]