traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 65227 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65227 | antoine.pitrou | 2008-07-25 19:45:59 +0200 (ven., 25 juil. 2008) | 3 lines

  #2242: utf7 decoding crashes on bogus input on some Windows/MSVC versions
........
This commit is contained in:
Antoine Pitrou 2008-07-25 18:05:24 +00:00
parent abd9a59763
commit 5ffd9e9cc9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_unicode.py
View File

@ -847,6 +847,9 @@ class UnicodeTest(
self.assertEqual(str(b'+3ADYAA-', 'utf-7', 'replace'), '\ufffd') self.assertEqual(str(b'+3ADYAA-', 'utf-7', 'replace'), '\ufffd')
# Issue #2242: crash on some Windows/MSVC versions
self.assertRaises(UnicodeDecodeError, b'+\xc1'.decode, 'utf-7')
def test_codecs_utf8(self): def test_codecs_utf8(self):
self.assertEqual(''.encode('utf-8'), b'') self.assertEqual(''.encode('utf-8'), b'')
self.assertEqual('\u20ac'.encode('utf-8'), b'\xe2\x82\xac') self.assertEqual('\u20ac'.encode('utf-8'), b'\xe2\x82\xac')

2
Objects/unicodeobject.c
View File

@ -1727,7 +1727,7 @@ PyObject *PyUnicode_DecodeUTF7Stateful(const char *s,
while (s < e) { while (s < e) {
Py_UNICODE ch; Py_UNICODE ch;
restart: restart:
ch = *s; ch = (unsigned char) *s;
if (inShift) { if (inShift) {
if ((ch == '-') || !B64CHAR(ch)) { if ((ch == '-') || !B64CHAR(ch)) {