diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 18:41:59 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 18:41:59 +0000 |
| commit | 9d76a3573963c7322bf04276a851c11daab8e84d (patch) | |
| tree | f64aff24773a9ce15db86963abb82d26a85f5f19 /Objects | |
| parent | 71db88e05bd2f7b1316894fa53d5178dd9efcc11 (diff) | |
| download | cpython-9d76a3573963c7322bf04276a851c11daab8e84d.tar.gz | |
Merged revisions 83395 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83395 | georg.brandl | 2010-08-01 10:49:18 +0200 (So, 01 Aug 2010) | 1 line
#8821: do not rely on Unicode strings being terminated with a \u0000, rather explicitly check range before looking for a second surrogate character.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 81b62e4fd8..42e0c9fec6 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3067,7 +3067,7 @@ PyObject *unicodeescape_string(const Py_UNICODE *s, ch2 = *s++; size--; - if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) { + if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) { ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; *p++ = '\\'; *p++ = 'U'; @@ -3316,7 +3316,7 @@ PyObject *PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s, ch2 = *s++; size--; - if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) { + if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) { ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000; *p++ = '\\'; *p++ = 'U'; |