mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-18 07:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #7732: Fix a crash on importing a module if a directory has the same name

Browse source 
than a Python module (e.g. "__init__.py"): don't close the file twice.

PyFile_FromFile() does also close the file if PyString_FromString() failed. It
did already close the file on fill_file_fields() error (e.g. if the file is a
directory).
This commit is contained in:
Victor Stinner 2011-09-23 19:37:03 +02:00
parent 51b719814e
commit 63c22fac72
5 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Objects/fileobject.c
View file

@ -468,28 +468,34 @@ close_the_file(PyFileObject *f)
PyObject *
PyFile_FromFile(FILE *fp, char *name, char *mode, int (*close)(FILE *))
{
PyFileObject *f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type,
NULL, NULL);
if (f != NULL) {
PyObject *o_name = PyString_FromString(name);
if (o_name == NULL)
return NULL;
if (fill_file_fields(f, fp, o_name, mode, close) == NULL) {
Py_DECREF(f);
f = NULL;
}
Py_DECREF(o_name);
PyFileObject *f;
PyObject *o_name;
f = (PyFileObject *)PyFile_Type.tp_new(&PyFile_Type, NULL, NULL);
if (f == NULL)
return NULL;
o_name = PyString_FromString(name);
if (o_name == NULL) {
if (close != NULL && fp != NULL)
close(fp);
Py_DECREF(f);
return NULL;
}
return (PyObject *) f;
if (fill_file_fields(f, fp, o_name, mode, close) == NULL) {
Py_DECREF(f);
Py_DECREF(o_name);
return NULL;
}
Py_DECREF(o_name);
return (PyObject *)f;
}
PyObject *
PyFile_FromString(char *name, char *mode)
{
extern int fclose(FILE *);
PyFileObject *f;
f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, fclose);
f = (PyFileObject *)PyFile_FromFile((FILE *)NULL, name, mode, NULL);
if (f != NULL) {
if (open_the_file(f, name, mode) == NULL) {
Py_DECREF(f);