diff options
| -rw-r--r-- | Modules/zipimport.c | 8 | ||||
| -rw-r--r-- | Python/import.c | 30 |
2 files changed, 26 insertions, 12 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index ed835c9cd8..09bd83aed7 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -742,7 +742,8 @@ read_directory(PyObject *archive) fp = _Py_fopen(archive, "rb"); if (fp == NULL) { - PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); + if (!PyErr_Occurred()) + PyErr_Format(ZipImportError, "can't open Zip file: %R", archive); return NULL; } fseek(fp, -22, SEEK_END); @@ -913,8 +914,9 @@ get_data(PyObject *archive, PyObject *toc_entry) fp = _Py_fopen(archive, "rb"); if (!fp) { - PyErr_Format(PyExc_IOError, - "zipimport: can not open file %U", archive); + if (!PyErr_Occurred()) + PyErr_Format(PyExc_IOError, + "zipimport: can not open file %U", archive); return NULL; } diff --git a/Python/import.c b/Python/import.c index 34d1a26dc7..c7541316b5 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3760,26 +3760,38 @@ get_file(PyObject *pathname, PyObject *fob, char *mode) mode = "r" PY_STDIOTEXTMODE; if (fob == NULL) { fp = _Py_fopen(pathname, mode); + if (!fp) { + if (!PyErr_Occurred()) + PyErr_SetFromErrno(PyExc_IOError); + return NULL; + } + return fp; } else { int fd = PyObject_AsFileDescriptor(fob); if (fd == -1) return NULL; - if (!_PyVerify_fd(fd)) - goto error; + if (!_PyVerify_fd(fd)) { + PyErr_SetFromErrno(PyExc_IOError); + return NULL; + } + /* the FILE struct gets a new fd, so that it can be closed * independently of the file descriptor given */ fd = dup(fd); - if (fd == -1) - goto error; + if (fd == -1) { + PyErr_SetFromErrno(PyExc_IOError); + return NULL; + } + fp = fdopen(fd, mode); - } - if (fp) + if (!fp) { + PyErr_SetFromErrno(PyExc_IOError); + return NULL; + } return fp; -error: - PyErr_SetFromErrno(PyExc_IOError); - return NULL; + } } static PyObject * |