Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault 

when encoding non-BMP unicode characters.  (Submitted by Ray Chason)
This commit is contained in:
Hye-Shik Chang 2006-10-08 13:48:34 +00:00
parent 846f73a530
commit b788346573
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_multibytecodec.py
View File

@ -208,6 +208,16 @@ class Test_ISO2022(unittest.TestCase):
e = u'\u3406'.encode(encoding)
self.failIf(filter(lambda x: x >= '\x80', e))
def test_bug1572832(self):
if sys.maxunicode >= 0x10000:
myunichr = unichr
else:
myunichr = lambda x: unichr(0xD7C0+(x>>10)) + unichr(0xDC00+(x&0x3FF))
for x in xrange(0x10000, 0x110000):
# Any ISO 2022 codec will cause the segfault
myunichr(x).encode('iso_2022_jp', 'ignore')
def test_main():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test_MultibyteCodec))

3
Misc/NEWS
View File

@ -123,6 +123,9 @@ Library
Extension Modules
-----------------
- Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault
when encoding non-BMP unicode characters.
- Bug #1556784: allow format strings longer than 127 characters in
datetime's strftime function.

36
Modules/cjkcodecs/_codecs_iso2022.c
View File

@ -592,9 +592,11 @@ ksx1001_encoder(const ucs4_t *data, Py_ssize_t *length)
{
DBCHAR coded;
assert(*length == 1);
TRYMAP_ENC(cp949, coded, *data)
if (!(coded & 0x8000))
return coded;
if (*data < 0x10000) {
TRYMAP_ENC(cp949, coded, *data)
if (!(coded & 0x8000))
return coded;
}
return MAP_UNMAPPABLE;
}
@ -628,11 +630,13 @@ jisx0208_encoder(const ucs4_t *data, Py_ssize_t *length)
{
DBCHAR coded;
assert(*length == 1);
if (*data == 0xff3c) /* F/W REVERSE SOLIDUS */
return 0x2140;
else TRYMAP_ENC(jisxcommon, coded, *data) {
if (!(coded & 0x8000))
return coded;
if (*data < 0x10000) {
if (*data == 0xff3c) /* F/W REVERSE SOLIDUS */
return 0x2140;
else TRYMAP_ENC(jisxcommon, coded, *data) {
if (!(coded & 0x8000))
return coded;
}
}
return MAP_UNMAPPABLE;
}
@ -665,9 +669,11 @@ jisx0212_encoder(const ucs4_t *data, Py_ssize_t *length)
{
DBCHAR coded;
assert(*length == 1);
TRYMAP_ENC(jisxcommon, coded, *data) {
if (coded & 0x8000)
return coded & 0x7fff;
if (*data < 0x10000) {
TRYMAP_ENC(jisxcommon, coded, *data) {
if (coded & 0x8000)
return coded & 0x7fff;
}
}
return MAP_UNMAPPABLE;
}
@ -970,9 +976,11 @@ gb2312_encoder(const ucs4_t *data, Py_ssize_t *length)
{
DBCHAR coded;
assert(*length == 1);
TRYMAP_ENC(gbcommon, coded, *data) {
if (!(coded & 0x8000))
return coded;
if (*data < 0x10000) {
TRYMAP_ENC(gbcommon, coded, *data) {
if (!(coded & 0x8000))
return coded;
}
}
return MAP_UNMAPPABLE;
}