mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 78875 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78875 | victor.stinner | 2010-03-12 18:00:41 +0100 (ven., 12 mars 2010) | 5 lines

  Issue #6697: use %U format instead of _PyUnicode_AsString(), because
  _PyUnicode_AsString() was not checked for error (NULL).

  The unicode string is no more truncated to 200 or 400 *bytes*.
........
This commit is contained in:
Victor Stinner 2010-03-21 21:05:53 +00:00
parent 19495a7adc
commit 38c36f8576
6 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/zipimport.c
View file

@ -321,15 +321,12 @@ zipimporter_load_module(PyObject *obj, PyObject *args)
/* add __path__ to the module *before* the code gets
executed */
PyObject *pkgpath, *fullpath;
char *prefix = _PyUnicode_AsString(self->prefix);
char *subname = get_subname(fullname);
int err;
fullpath = PyUnicode_FromFormat("%s%c%s%s",
_PyUnicode_AsString(self->archive),
SEP,
prefix ? prefix : "",
subname);
fullpath = PyUnicode_FromFormat("%U%c%U%s",
self->archive, SEP,
self->prefix, subname);
if (fullpath == NULL)
goto error;