Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix an issue in the tokenizer, where a file is opened by fd, but the underlying PyFileIO object wasn created with the closefd attribute true. 

Also fix error handling for close() int _fileio.c .  It was incorrect, looking for a negative refcount, and so errors weren't raised.  This is why this issue wasn't caught.
There is a second reason why it isn't seen:  Class IOBase in io.py has a try:/except: around the close() funtion in the __del__() method.  This also masks these error conditions.

This issue was discovered by removing the _set_invalid_parameter_handler() fiddling, thus enabling the C runtime checks on windows.
This commit is contained in:
Kristján Valur Jónsson 2008-12-18 17:15:54 +00:00
parent baa4546b02
commit 19288c247a
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/_fileio.c
View File

@ -55,20 +55,27 @@ PyTypeObject PyFileIO_Type;
#define PyFileIO_Check(op) (PyObject_TypeCheck((op), &PyFileIO_Type))
/* Returns 0 on success, errno (which is < 0) on failure. */
/* Returns 0 on success, -1 with exception set on failure. */
static int
internal_close(PyFileIOObject *self)
{
int save_errno = 0;
int err = 0;
int save_errno;
if (self->fd >= 0) {
int fd = self->fd;
self->fd = -1;
Py_BEGIN_ALLOW_THREADS
if (close(fd) < 0)
err = close(fd);
if (err < 0)
save_errno = errno;
Py_END_ALLOW_THREADS
}
return save_errno;
if (err < 0) {
errno = save_errno;
PyErr_SetFromErrno(PyExc_IOError);
return -1;
}
return 0;
}
static PyObject *
@ -78,11 +85,8 @@ fileio_close(PyFileIOObject *self)
self->fd = -1;
Py_RETURN_NONE;
}
errno = internal_close(self);
if (errno < 0) {
PyErr_SetFromErrno(PyExc_IOError);
if (internal_close(self))
return NULL;
}
Py_RETURN_NONE;
}
@ -121,7 +125,8 @@ dircheck(PyFileIOObject* self)
if (fstat(self->fd, &buf) == 0 && S_ISDIR(buf.st_mode)) {
char *msg = strerror(EISDIR);
PyObject *exc;
internal_close(self);
if (internal_close(self))
return -1;
exc = PyObject_CallFunction(PyExc_IOError, "(is)",
EISDIR, msg);
@ -306,11 +311,8 @@ fileio_dealloc(PyFileIOObject *self)
PyObject_ClearWeakRefs((PyObject *) self);
if (self->fd >= 0 && self->closefd) {
errno = internal_close(self);
if (errno < 0) {
PySys_WriteStderr("close failed: [Errno %d] %s\n",
errno, strerror(errno));
}
if(internal_close(self))
PyErr_WriteUnraisable((PyObject*)self);
}
Py_TYPE(self)->tp_free((PyObject *)self);

4
Parser/tokenizer.c
View File

@ -452,8 +452,8 @@ fp_setreadl(struct tok_state *tok, const char* enc)
stream = PyObject_CallMethod(io, "open", "ssis",
tok->filename, "r", -1, enc);
else
stream = PyObject_CallMethod(io, "open", "isis",
fileno(tok->fp), "r", -1, enc);
stream = PyObject_CallMethod(io, "open", "isisOOO",
fileno(tok->fp), "r", -1, enc, Py_None, Py_None, Py_False);
if (stream == NULL)
goto cleanup;