1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #17237: Fix crash in the ASCII decoder on m68k.

Browse Source
This commit is contained in:
Antoine Pitrou 2013-05-11 15:58:34 +02:00
parent d8f870d0fa
commit 8b0e98426d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -12,6 +12,8 @@ What's New in Python 3.3.2?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #17237: Fix crash in the ASCII decoder on m68k.
- Issue #17408: Avoid using an obsolete instance of the copyreg module when - Issue #17408: Avoid using an obsolete instance of the copyreg module when
the interpreter is shutdown and then started again. the interpreter is shutdown and then started again.

9
Objects/unicodeobject.c
View File

@ -4661,6 +4661,14 @@ ascii_decode(const char *start, const char *end, Py_UCS1 *dest)
const char *p = start; const char *p = start;
const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG); const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
/*
* Issue #17237: m68k is a bit different from most architectures in
* that objects do not use "natural alignment" - for example, int and
* long are only aligned at 2-byte boundaries. Therefore the assert()
* won't work; also, tests have shown that skipping the "optimised
* version" will even speed up m68k.
*/
#if !defined(__m68k__)
#if SIZEOF_LONG <= SIZEOF_VOID_P #if SIZEOF_LONG <= SIZEOF_VOID_P
assert(_Py_IS_ALIGNED(dest, SIZEOF_LONG)); assert(_Py_IS_ALIGNED(dest, SIZEOF_LONG));
if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) { if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
@ -4685,6 +4693,7 @@ ascii_decode(const char *start, const char *end, Py_UCS1 *dest)
} }
return p - start; return p - start;
} }
#endif
#endif #endif
while (p < end) { while (p < end) {
/* Fast path, see in STRINGLIB(utf8_decode) in stringlib/codecs.h /* Fast path, see in STRINGLIB(utf8_decode) in stringlib/codecs.h