summaryrefslogtreecommitdiffstats
path: root/Modules/zipimport.c
diff options
context:
space:
mode:
Diffstat (limited to 'Modules/zipimport.c')
-rw-r--r--Modules/zipimport.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 11c3904..d8c3d8a 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -714,15 +714,16 @@ read_directory(PyObject *archive_obj)
PyObject *files = NULL;
FILE *fp;
unsigned short flags;
- long compress, crc, data_size, file_size, file_offset, date, time;
- long header_offset, name_size, header_size, header_position;
+ short compress, time, date, name_size;
+ long crc, data_size, file_size, header_size;
+ Py_ssize_t file_offset, header_position, header_offset;
long i, l, count;
size_t length;
Py_UNICODE path[MAXPATHLEN + 5];
char name[MAXPATHLEN + 5];
PyObject *nameobj = NULL;
char *p, endof_central_dir[22];
- long arc_offset; /* offset from beginning of file to start of zip-archive */
+ Py_ssize_t arc_offset; /* Absolute offset to start of the zip-archive. */
PyObject *pathobj;
const char *charset;
int bootstrap;
@@ -832,7 +833,7 @@ read_directory(PyObject *archive_obj)
pathobj = PyUnicode_FromUnicode(path, Py_UNICODE_strlen(path));
if (pathobj == NULL)
goto error;
- t = Py_BuildValue("Niiiiiii", pathobj, compress, data_size,
+ t = Py_BuildValue("Nhllnhhl", pathobj, compress, data_size,
file_size, file_offset, time, date, crc);
if (t == NULL)
goto error;