mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 14:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

zipimport: read_directory() uses cp437 or utf-8 (in strict mode), depending on

Browse source 
the unicode flag, to decode the filename, instead of the filesystem encoding.
Use the same choice than the zipfile module.
This commit is contained in:
Victor Stinner 2010-10-18 12:13:46 +00:00
parent b08820ad40
commit d36c8217e1
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/zipimport.c
View file

@ -714,6 +714,7 @@ read_directory(PyObject *archive_obj)
/* FIXME: work on Py_UNICODE* instead of char* */ /* FIXME: work on Py_UNICODE* instead of char* */
PyObject *files = NULL; PyObject *files = NULL;
FILE *fp; FILE *fp;
unsigned short flags;
long compress, crc, data_size, file_size, file_offset, date, time; long compress, crc, data_size, file_size, file_offset, date, time;
long header_offset, name_size, header_size, header_position; long header_offset, name_size, header_size, header_position;
long i, l, count; long i, l, count;
@ -724,6 +725,7 @@ read_directory(PyObject *archive_obj)
char *p, endof_central_dir[22]; char *p, endof_central_dir[22];
long arc_offset; /* offset from beginning of file to start of zip-archive */ long arc_offset; /* offset from beginning of file to start of zip-archive */
PyObject *pathobj; PyObject *pathobj;
const char *charset;
if (PyUnicode_GET_SIZE(archive_obj) > MAXPATHLEN) { if (PyUnicode_GET_SIZE(archive_obj) > MAXPATHLEN) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
@ -776,7 +778,8 @@ read_directory(PyObject *archive_obj)
l = PyMarshal_ReadLongFromFile(fp); l = PyMarshal_ReadLongFromFile(fp);
if (l != 0x02014B50) if (l != 0x02014B50)
break; /* Bad: Central Dir File Header */ break; /* Bad: Central Dir File Header */
fseek(fp, header_offset + 10, 0); fseek(fp, header_offset + 8, 0);
flags = (unsigned short)PyMarshal_ReadShortFromFile(fp);
compress = PyMarshal_ReadShortFromFile(fp); compress = PyMarshal_ReadShortFromFile(fp);
time = PyMarshal_ReadShortFromFile(fp); time = PyMarshal_ReadShortFromFile(fp);
date = PyMarshal_ReadShortFromFile(fp); date = PyMarshal_ReadShortFromFile(fp);
@ -802,7 +805,11 @@ read_directory(PyObject *archive_obj)
*p = 0; /* Add terminating null byte */ *p = 0; /* Add terminating null byte */
header_offset += header_size; header_offset += header_size;
nameobj = PyUnicode_DecodeFSDefaultAndSize(name, name_size); if (flags & 0x0800)
charset = "utf-8";
else
charset = "cp437";
nameobj = PyUnicode_Decode(name, name_size, charset, NULL);
if (nameobj == NULL) if (nameobj == NULL)
goto error; goto error;
Py_UNICODE_strncpy(path + length + 1, PyUnicode_AS_UNICODE(nameobj), MAXPATHLEN - length - 1); Py_UNICODE_strncpy(path + length + 1, PyUnicode_AS_UNICODE(nameobj), MAXPATHLEN - length - 1);