From cf45325b61e2eb3a2c83b9f869cf56684d6cb679 Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Wed, 3 Oct 2012 03:16:42 +0200 Subject: Closes #15897: zipimport.c doesn't check return value of fseek(). Typo --- Modules/zipimport.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c index d4e4927..7ae4f0a 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -744,7 +744,7 @@ read_directory(PyObject *archive_obj) if (fseek(fp, -22, SEEK_END) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive_obj); return NULL; } header_position = ftell(fp); @@ -861,7 +861,7 @@ fseek_error: fclose(fp); Py_XDECREF(files); Py_XDECREF(nameobj); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive_obj); return NULL; error: fclose(fp); @@ -934,7 +934,7 @@ get_data(PyObject *archive, PyObject *toc_entry) /* Check to make sure the local file header is correct */ if (fseek(fp, file_offset, 0) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } @@ -949,7 +949,7 @@ get_data(PyObject *archive, PyObject *toc_entry) } if (fseek(fp, file_offset + 26, 0) == -1) { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } @@ -973,7 +973,7 @@ get_data(PyObject *archive, PyObject *toc_entry) bytes_read = fread(buf, 1, data_size, fp); } else { fclose(fp); - PyErr_Format(ZipImportError, "can't read Zip file: %R", archive); + PyErr_Format(ZipImportError, "can't read Zip file: %U", archive); return NULL; } fclose(fp); -- cgit v0.12