diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_io/fileio.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index c51d697..6feca21 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -224,6 +224,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) int flags = 0; int fd = -1; int closefd = 1; + int fd_is_own = 0; assert(PyFileIO_Check(oself)); if (self->fd >= 0) { @@ -362,6 +363,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) #endif self->fd = open(name, flags, 0666); Py_END_ALLOW_THREADS + fd_is_own = 1; if (self->fd < 0) { #ifdef MS_WINDOWS if (widename != NULL) @@ -388,13 +390,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) end of file (otherwise, it might be done only on the first write()). */ PyObject *pos = portable_lseek(self->fd, NULL, 2); - if (pos == NULL) { - if (closefd) { - close(self->fd); - self->fd = -1; - } + if (pos == NULL) goto error; - } Py_DECREF(pos); } @@ -402,6 +399,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) error: ret = -1; + if (!fd_is_own) + self->fd = -1; if (self->fd >= 0) internal_close(self); |