diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch deleted file mode 100644 index 3afdbc0f6e..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2012-2135.patch +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Reference:http://bugs.python.org/issue14579 | ||
4 | |||
5 | The utf-16 decoder in Python 3.1 through 3.3 does not update the | ||
6 | aligned_end variable after calling the unicode_decode_call_errorhandler | ||
7 | function, which allows remote attackers to obtain sensitive information | ||
8 | (process memory) or cause a denial of service (memory corruption and crash) | ||
9 | via unspecified vectors. | ||
10 | |||
11 | http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2135 | ||
12 | |||
13 | diff -urpN a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py | ||
14 | --- a/Lib/test/test_codecs.py | ||
15 | +++ b/Lib/test/test_codecs.py | ||
16 | @@ -495,8 +495,21 @@ class UTF16LETest(ReadTest): | ||
17 | ) | ||
18 | |||
19 | def test_errors(self): | ||
20 | - self.assertRaises(UnicodeDecodeError, codecs.utf_16_le_decode, "\xff", "strict", True) | ||
21 | - | ||
22 | + tests = [ | ||
23 | + (b'\xff', u'\ufffd'), | ||
24 | + (b'A\x00Z', u'A\ufffd'), | ||
25 | + (b'A\x00B\x00C\x00D\x00Z', u'ABCD\ufffd'), | ||
26 | + (b'\x00\xd8', u'\ufffd'), | ||
27 | + (b'\x00\xd8A', u'\ufffd'), | ||
28 | + (b'\x00\xd8A\x00', u'\ufffdA'), | ||
29 | + (b'\x00\xdcA\x00', u'\ufffdA'), | ||
30 | + ] | ||
31 | + for raw, expected in tests: | ||
32 | + print('*****', raw, expected) | ||
33 | + self.assertRaises(UnicodeDecodeError, codecs.utf_16_le_decode, | ||
34 | + raw, 'strict', True) | ||
35 | + self.assertEqual(raw.decode('utf-16le', 'replace'), expected) | ||
36 | + | ||
37 | class UTF16BETest(ReadTest): | ||
38 | encoding = "utf-16-be" | ||
39 | |||
40 | @@ -516,7 +529,20 @@ class UTF16BETest(ReadTest): | ||
41 | ) | ||
42 | |||
43 | def test_errors(self): | ||
44 | - self.assertRaises(UnicodeDecodeError, codecs.utf_16_be_decode, "\xff", "strict", True) | ||
45 | + tests = [ | ||
46 | + (b'\xff', u'\ufffd'), | ||
47 | + (b'\x00A\xff', u'A\ufffd'), | ||
48 | + (b'\x00A\x00B\x00C\x00DZ', u'ABCD\ufffd'), | ||
49 | + (b'\xd8\x00', u'\ufffd'), | ||
50 | + (b'\xd8\x00\xdc', u'\ufffd'), | ||
51 | + (b'\xd8\x00\x00A', u'\ufffdA'), | ||
52 | + (b'\xdc\x00\x00A', u'\ufffdA'), | ||
53 | + ] | ||
54 | + for raw, expected in tests: | ||
55 | + print('*****', raw, expected) | ||
56 | + self.assertRaises(UnicodeDecodeError, codecs.utf_16_be_decode, | ||
57 | + raw, 'strict', True) | ||
58 | + self.assertEqual(raw.decode('utf-16be', 'replace'), expected) | ||
59 | |||
60 | class UTF8Test(ReadTest): | ||
61 | encoding = "utf-8" | ||
62 | diff -urpN a/Objects/unicodeobject.c b/Objects/unicodeobject.c | ||
63 | --- a/Objects/unicodeobject.c 2013-03-04 11:34:34.000000000 +0800 | ||
64 | +++ b/Objects/unicodeobject.c 2013-03-04 11:36:01.000000000 +0800 | ||
65 | @@ -2564,7 +2564,7 @@ PyUnicode_DecodeUTF16Stateful(const char | ||
66 | } | ||
67 | |||
68 | /* UTF-16 code pair: */ | ||
69 | - if (q >= e) { | ||
70 | + if (e - q < 2) { | ||
71 | errmsg = "unexpected end of data"; | ||
72 | startinpos = (((const char *)q)-2)-starts; | ||
73 | endinpos = ((const char *)e)-starts; | ||