[Python-checkins] r73426 - in python/branches/release26-maint: Misc/NEWS Modules/mmapmodule.c

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Sun Jun 14 06:48:42 2009
New Revision: 73426

Log:
Merged revisions 73425 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73425 | hirokazu.yamamoto | 2009-06-14 12:53:55 +0900 | 2 lines
  
  Issue #6271: mmap tried to close invalid file handle (-1) when annonymous.
  (On Unix) Patch by STINNER Victor.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/mmapmodule.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Jun 14 06:48:42 2009
@@ -56,6 +56,9 @@
 Library
 -------
 
+- Issue #6271: mmap tried to close invalid file handle (-1) when annonymous.
+  (On Unix)
+
 - Issue #6258: Support AMD64 in bdist_msi.
 
 - Issue #5262: Fixed bug in next rollover time computation in

Modified: python/branches/release26-maint/Modules/mmapmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/mmapmodule.c	(original)
+++ python/branches/release26-maint/Modules/mmapmodule.c	Sun Jun 14 06:48:42 2009
@@ -158,7 +158,8 @@
 #endif /* MS_WINDOWS */
 
 #ifdef UNIX
-	(void) close(self->fd);
+	if (0 <= self->fd)
+		(void) close(self->fd);
 	self->fd = -1;
 	if (self->data != NULL) {
 		munmap(self->data, self->size);