mirror of
https://github.com/python/cpython
synced 2024-10-14 08:51:20 +00:00
Fix zipimport.c's read_directory() to use appropriate types for the values
being read from the header vs the values being used by fseek and ftell (Py_ssize_t for those). Updates the Py_BuildValue format string to match (including several existing wrong 'i's that should have been 'l's).
This commit is contained in:
commit
cc6abd56b8
|
@ -728,14 +728,15 @@ read_directory(PyObject *archive)
|
|||
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 l, count;
|
||||
Py_ssize_t i;
|
||||
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 *path;
|
||||
const char *charset;
|
||||
int bootstrap;
|
||||
|
@ -835,7 +836,7 @@ read_directory(PyObject *archive)
|
|||
path = PyUnicode_FromFormat("%U%c%U", archive, SEP, nameobj);
|
||||
if (path == NULL)
|
||||
goto error;
|
||||
t = Py_BuildValue("Niiiiiii", path, compress, data_size,
|
||||
t = Py_BuildValue("Nhllnhhl", path, compress, data_size,
|
||||
file_size, file_offset, time, date, crc);
|
||||
if (t == NULL)
|
||||
goto error;
|
||||
|
|
Loading…
Reference in a new issue