From: Hirokazu Yamamoto Date: Sun, 14 Jun 2009 05:16:35 +0000 (+0000) Subject: Merged revisions 73427 via svnmerge from X-Git-Tag: 3.0~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2158ea52fb6270c40b82f8f7f2ce9b0d9eb3d795;p=thirdparty%2FPython%2Fcpython.git Merged revisions 73427 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73427 | hirokazu.yamamoto | 2009-06-14 13:58:16 +0900 | 10 lines 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. ........ ................ --- diff --git a/Misc/NEWS b/Misc/NEWS index 21f544945501..bc3f41d2e26a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -73,6 +73,9 @@ Core and Builtins Library ------- +- Issue #6271: mmap tried to close invalid file handle (-1) when annonymous. + (On Unix) + - Issue #6258: Support AMD64 in bdist_msi. - Fix a bug in the trace module where a bytes object from co_lnotab had its diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 5943a460e81d..ef2b2773b822 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -164,7 +164,8 @@ mmap_close_method(mmap_object *self, PyObject *unused) #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);