mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Antoine Pitrou 2013-05-11 15:59:37 +02:00
commit 7ce35a1816
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #17237: Fix crash in the ASCII decoder on m68k.
- Issue #17927: Frame objects kept arguments alive if they had been - Issue #17927: Frame objects kept arguments alive if they had been
copied into a cell, even if the cell was cleared. copied into a cell, even if the cell was cleared.

9
Objects/unicodeobject.c
View file

@ -4647,6 +4647,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)) {
@ -4671,6 +4679,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