diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-06-29 22:38:54 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-06-29 22:38:54 (GMT) |
| commit | e5344d6c45f15e8cd5b450311a402de568f54b47 (patch) | |
| tree | 150fa35d9135b3d2c751fdf192a0659e54ef28a5 /Objects | |
| parent | 77b31ef202359e6f29d261b7dfbb356f36d49123 (diff) | |
| download | cpython-e5344d6c45f15e8cd5b450311a402de568f54b47.zip cpython-e5344d6c45f15e8cd5b450311a402de568f54b47.tar.gz cpython-e5344d6c45f15e8cd5b450311a402de568f54b47.tar.bz2 | |
Merged revisions 73698 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r73698 | amaury.forgeotdarc | 2009-06-30 00:36:49 +0200 (mar., 30 juin 2009) | 7 lines
#6373: SystemError in str.encode('latin1', 'surrogateescape')
if the string contains unpaired surrogates.
(In debug build, crash in assert())
This can happen with normal processing, if python starts with utf-8,
then calls sys.setfilesystemencoding('latin-1')
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 0d4a3dd..305289b 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4201,10 +4201,12 @@ static PyObject *unicode_encode_ucs1(const Py_UNICODE *p, repsize = PyBytes_Size(repunicode); if (repsize > 1) { /* Make room for all additional bytes. */ + respos = str - PyBytes_AS_STRING(res); if (_PyBytes_Resize(&res, ressize+repsize-1)) { Py_DECREF(repunicode); goto onError; } + str = PyBytes_AS_STRING(res) + respos; ressize += repsize-1; } memcpy(str, PyBytes_AsString(repunicode), repsize); |